Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

We need to revert the temporary hack in 71ebc01, hence the merge.

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/avr32/Kconfig
Simple merge

diff --cc arch/blackfin/Kconfig
Simple merge

diff --cc arch/cris/Kconfig
Simple merge

diff --cc arch/frv/Kconfig
Simple merge

diff --cc arch/h8300/Kconfig
Simple merge

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/m32r/Kconfig
Simple merge

diff --cc arch/m68k/Kconfig
Simple merge

diff --cc arch/m68knommu/Kconfig
Simple merge

diff --cc arch/microblaze/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
index 3377167,3ad59dd..9f61741
--- 1/arch/mips/Kconfig
--- 2/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -10,8 -10,12 +10,10 @@@ config MIP
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_FUNCTION_GRAPH_TRACER
+       select HAVE_KPROBES
+       select HAVE_KRETPROBES
        select RTC_LIB if !MACH_LOONGSON
  
 -mainmenu "Linux/MIPS Kernel Configuration"
 -
  menu "Machine selection"
  
  config ZONE_DMA

diff --cc arch/mn10300/Kconfig
Simple merge

diff --cc arch/parisc/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/score/Kconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/um/Kconfig.common
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/xtensa/Kconfig
Simple merge

diff --cc scripts/kconfig/conf.c
Simple merge

diff --cc scripts/kconfig/expr.h
Simple merge

diff --cc scripts/kconfig/menu.c
Simple merge

diff --cc scripts/kconfig/symbol.c
Simple merge