Merge branch 'linux-2.6'
commit9156ad48338e0306e508ead5c0d9986050744475
authorPaul Mackerras <paulus@samba.org>
Wed, 23 Jan 2008 23:07:21 +0000 (24 10:07 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 23 Jan 2008 23:07:21 +0000 (24 10:07 +1100)
tree37f3a90e38190052ecf3cdf9171dfdddd37b56fd
parentfa28237cfcc5827553044cbd6ee52e33692b0faa
parent8f7b3d156d348b6766833cd4e272d0d19b501e64
Merge branch 'linux-2.6'
Documentation/kernel-parameters.txt
arch/powerpc/kernel/iommu.c
arch/powerpc/mm/slb.c
arch/powerpc/platforms/cell/Makefile
arch/powerpc/platforms/cell/spufs/context.c
arch/powerpc/platforms/cell/spufs/sched.c
include/asm-powerpc/spu.h