Merge branch 'linux-2.6'

diff --cc arch/powerpc/Kconfig
index e4e13e0,1189d8d..ef12db0
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -90,7 -90,7 +90,8 @@@ config PP
        select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_KPROBES
+       select HAVE_KRETPROBES
 +      select HAVE_LMB
  
  config EARLY_PRINTK
        bool

diff --cc arch/powerpc/mm/hash_utils_64.c
Simple merge

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

diff --cc arch/sparc64/Kconfig
Simple merge