Merge branch 'linux-2.6' into for-2.6.22

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/platforms/85xx/Kconfig
index 124e2c5,e764c0a..329fcd4
--- 1/arch/powerpc/platforms/85xx/Kconfig
--- 2/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@@ -53,8 -47,8 +53,9 @@@ config MPC85x
        bool
        select PPC_UDBG_16550
        select PPC_INDIRECT_PCI
 -      default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS || MPC85xx_MDS
+       select SERIAL_8250_SHARE_IRQ if SERIAL_8250
 +      default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \
 +              || MPC85xx_MDS || MPC8544_DS
  
  config PPC_INDIRECT_PCI_BE
        bool

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

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/video/Kconfig
Simple merge