Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's
gone, gone, gone).
Signed-off-by:
Linus Torvalds <torvalds@osdl.org>
No related branches found
No related tags found
Showing
- arch/powerpc/kernel/Makefile 3 additions, 3 deletionsarch/powerpc/kernel/Makefile
- arch/powerpc/kernel/pci_64.c 3 additions, 2 deletionsarch/powerpc/kernel/pci_64.c
- arch/powerpc/kernel/process.c 5 additions, 3 deletionsarch/powerpc/kernel/process.c
- arch/powerpc/kernel/prom.c 24 additions, 4 deletionsarch/powerpc/kernel/prom.c
- arch/powerpc/kernel/prom_init.c 4 additions, 4 deletionsarch/powerpc/kernel/prom_init.c
- arch/powerpc/kernel/signal_32.c 9 additions, 12 deletionsarch/powerpc/kernel/signal_32.c
- arch/powerpc/kernel/signal_64.c 11 additions, 9 deletionsarch/powerpc/kernel/signal_64.c
- arch/powerpc/platforms/cell/pervasive.c 1 addition, 1 deletionarch/powerpc/platforms/cell/pervasive.c
- arch/powerpc/platforms/cell/setup.c 1 addition, 1 deletionarch/powerpc/platforms/cell/setup.c
- arch/powerpc/platforms/cell/spufs/syscalls.c 3 additions, 1 deletionarch/powerpc/platforms/cell/spufs/syscalls.c
- arch/powerpc/platforms/iseries/Makefile 2 additions, 2 deletionsarch/powerpc/platforms/iseries/Makefile
- arch/powerpc/platforms/iseries/iommu.c 2 additions, 0 deletionsarch/powerpc/platforms/iseries/iommu.c
- arch/powerpc/platforms/iseries/iommu.h 35 additions, 0 deletionsarch/powerpc/platforms/iseries/iommu.h
- arch/powerpc/platforms/iseries/irq.c 8 additions, 11 deletionsarch/powerpc/platforms/iseries/irq.c
- arch/powerpc/platforms/iseries/lpardata.c 1 addition, 4 deletionsarch/powerpc/platforms/iseries/lpardata.c
- arch/powerpc/platforms/iseries/lpevents.c 6 additions, 6 deletionsarch/powerpc/platforms/iseries/lpevents.c
- arch/powerpc/platforms/iseries/mf.c 3 additions, 13 deletionsarch/powerpc/platforms/iseries/mf.c
- arch/powerpc/platforms/iseries/pci.c 1 addition, 0 deletionsarch/powerpc/platforms/iseries/pci.c
- arch/powerpc/platforms/iseries/vio.c 2 additions, 0 deletionsarch/powerpc/platforms/iseries/vio.c
- arch/powerpc/platforms/iseries/viopath.c 5 additions, 7 deletionsarch/powerpc/platforms/iseries/viopath.c
Loading
Please register or sign in to comment