Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
[linux-2.6] / include / asm-powerpc / setup.h
2005-09-09  Greg KHMerge gregkh@/linux/kernel/git/gregkh/driver-2.6
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/paulus/ppc64-2.6
2005-09-09  jdl@freescale.com[PATCH] powerpc: Merge a few more include files