Merge branch 'linux-2.6' into for-2.6.22
authorPaul Mackerras <paulus@samba.org>
Thu, 12 Apr 2007 17:50:03 +0000 (03:50 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 12 Apr 2007 17:50:03 +0000 (03:50 +1000)
commite049d1ca3094f3d1d94617f456a9961202f96e3a
treea30397ad22f2fbea268bd28fa69c60aad9dfa62a
parentedfac96a92b88d3b0b53e3f8231b74beee9ecd1d
parent80584ff3b99c36ead7e130e453b3a48b18072d18
Merge branch 'linux-2.6' into for-2.6.22
arch/powerpc/kernel/process.c
arch/powerpc/platforms/85xx/Kconfig
arch/powerpc/platforms/pasemi/iommu.c
drivers/net/Kconfig
drivers/video/Kconfig