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)
commitb2315372eac9cd9f622c32a93e323cf6f0f03462
tree9e1faa7cdcddf5d90bec4fb9523742d4cce699a1
parent5326152fa182b0a16e4abf913ce403e3c7ab53b7
parentc87ce65868bbf9bbea9c3f112ff8315302daf8f2
Merge branch 'linux-2.6' into for-2.6.24
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