Merge branch 'linux-2.6' into for-2.6.24
commit35438c4327df18dbf5e7f597b69299119f4a14de
authorPaul Mackerras <paulus@samba.org>
Tue, 28 Aug 2007 05:56:11 +0000 (28 15:56 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 28 Aug 2007 05:56:11 +0000 (28 15:56 +1000)
treea4589d731015db93f2eba8f84ffb1f48a8084020
parent2f6c9d961081dc7b109eb19166244bcb2a5dfc28
parentb07d68b5ca4d55a16fab223d63d5fb36f89ff42f
Merge branch 'linux-2.6' into for-2.6.24
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