pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 19a7985 2b5f6dc)

author	Paul Mackerras <paulus@samba.org>
	Mon, 4 Dec 2006 04:59:07 +0000 (15:59 +1100)
committer	Paul Mackerras <paulus@samba.org>
	Mon, 4 Dec 2006 04:59:07 +0000 (15:59 +1100)
commit	79acbb3ff2d8095b692e1502b9eb2ccec348de26
tree	6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e	tree \| snapshot
parent	19a79859e168640f8e16d7b216d211c1c52b687a	commit \| diff
parent	2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2	commit \| diff

Merge branch 'linux-2.6' into for-linus

17 files changed:

arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/boot/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/cell_defconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/cputable.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/head_64.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/prom.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup_32.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/cell/spu_base.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/cell/spufs/file.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/cell/spufs/hw_ops.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/iseries/setup.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/qe_lib/qe.c	diff1 \|	diff2 \|	blob \| history
include/asm-powerpc/iommu.h	diff1 \|	diff2 \|	blob \| history
include/asm-powerpc/pci.h	diff1 \|	diff2 \|	blob \| history
include/asm-powerpc/prom.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.