Merge branch 'linux-2.6' into for-2.6.24
authorPaul Mackerras <paulus@samba.org>
Thu, 13 Sep 2007 15:24:25 +0000 (01:24 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 13 Sep 2007 15:24:25 +0000 (01:24 +1000)
1  2 
arch/powerpc/configs/ebony_defconfig
arch/powerpc/platforms/85xx/mpc85xx_cds.c
arch/powerpc/platforms/85xx/mpc85xx_mds.c
arch/powerpc/platforms/Kconfig
arch/powerpc/sysdev/cpm2_common.c

Simple merge
Simple merge
Simple merge