]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'linux-2.6' into for-linus
authorPaul Mackerras <paulus@samba.org>
Mon, 4 Dec 2006 04:59:07 +0000 (15:59 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 4 Dec 2006 04:59:07 +0000 (15:59 +1100)
commit79acbb3ff2d8095b692e1502b9eb2ccec348de26
tree6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e
parent19a79859e168640f8e16d7b216d211c1c52b687a
parent2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2
Merge branch 'linux-2.6' into for-linus
17 files changed:
arch/powerpc/Kconfig
arch/powerpc/boot/Makefile
arch/powerpc/configs/cell_defconfig
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/cputable.c
arch/powerpc/kernel/head_64.S
arch/powerpc/kernel/prom.c
arch/powerpc/kernel/setup_32.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/platforms/cell/spu_base.c
arch/powerpc/platforms/cell/spufs/file.c
arch/powerpc/platforms/cell/spufs/hw_ops.c
arch/powerpc/platforms/iseries/setup.c
arch/powerpc/sysdev/qe_lib/qe.c
include/asm-powerpc/iommu.h
include/asm-powerpc/pci.h
include/asm-powerpc/prom.h