Merge branch 'linux-2.6' into for-2.6.24
authorPaul Mackerras <paulus@samba.org>
Tue, 28 Aug 2007 05:56:11 +0000 (15:56 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 28 Aug 2007 05:56:11 +0000 (15:56 +1000)
1  2 
arch/powerpc/platforms/Kconfig
arch/powerpc/platforms/pasemi/iommu.c
arch/powerpc/sysdev/fsl_soc.c
drivers/char/ipmi/ipmi_si_intf.c
drivers/macintosh/via-pmu.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge