Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 18:03:44 +0000 (10:03 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 18:03:44 +0000 (10:03 -0800)
commit6150c32589d1976ca8a5c987df951088c05a7542
tree94073696576323ff966e365d8c47b8ecd8372f97
parent44637a12f80b80157d9c1bc5b7d6ef09c9e05713
parentbe42d5fa3772241b8ecebd443f1fb36247959c54
Merge git://git./linux/kernel/git/paulus/powerpc-merge
arch/powerpc/Kconfig
include/asm-powerpc/dma-mapping.h
include/linux/syscalls.h
kernel/sys_ni.c