Merge branch 'linux-2.6' into for-2.6.24

diff --cc arch/powerpc/platforms/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/pasemi/iommu.c
Simple merge

diff --cc arch/powerpc/sysdev/fsl_soc.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
Simple merge

diff --cc drivers/macintosh/via-pmu.c
Simple merge