Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Thu, 13 Mar 2008 04:26:33 +0000 (15:26 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 13 Mar 2008 04:26:33 +0000 (15:26 +1100)
1  2 
arch/powerpc/Kconfig
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/platforms/cell/iommu.c
arch/sparc64/Kconfig

index e4e13e0bca16d67024181891effcc05a6423f46d,1189d8d6170d252013ddcf112903073297308da7..ef12db07b22f41362fc81d79d2168fee0c03ba22
@@@ -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
Simple merge
Simple merge
Simple merge