Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (38 commits)
  kbuild: convert `arch/tile' to the kconfig mainmenu upgrade
  README: cite nconfig
  Revert "kconfig: Temporarily disable dependency warnings"
  kconfig: Use PATH_MAX instead of 128 for path buffer sizes.
  kconfig: Fix realloc usage()
  kconfig: Propagate const
  kconfig: Don't go out from read config loop when you read new symbol
  kconfig: fix menuconfig on debian lenny
  kbuild: migrate all arch to the kconfig mainmenu upgrade
  kconfig: expand file names
  kconfig: use the file's name of sourced file
  kconfig: constify file name
  kconfig: don't emit warning upon rootmenu's prompt redefinition
  kconfig: replace KERNELVERSION usage by the mainmenu's prompt
  kconfig: delay gconf window initialization
  kconfig: expand by default the rootmenu's prompt
  kconfig: add a symbol string expansion helper
  kconfig: regen parser
  kconfig: implement the `mainmenu' directive
  kconfig: allow PACKAGE to be defined on the compiler's command-line
  ...

Fix up trivial conflict in arch/mn10300/Kconfig

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/frv/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 46cae2b163e4a1e6286584e28496f59d7e41d844,9f617417c0a39f266630fc11506c829cf5f6b723..cf8d0945530c4b77f42cde9421c79591efc980f1
--- 1/arch/mips/Kconfig
--- 2/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -13,10 -13,7 +13,8 @@@ config MIP
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select RTC_LIB if !MACH_LOONGSON
 +      select GENERIC_ATOMIC64 if !64BIT
  
- mainmenu "Linux/MIPS Kernel Configuration"
- 
  menu "Machine selection"
  
  config ZONE_DMA

diff --cc arch/mn10300/Kconfig
index 365766a3d536025ad0692643edbad8ffb6fee0d5,ba8bd665ba4b5ad5893d4bc1f6c69fad66d0e943..41ba38513c8943f1ad1441cb818ba22411b100ae
--- 1/arch/mn10300/Kconfig
--- 2/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@@ -93,8 -55,10 +86,6 @@@ config GENERIC_HARDIRQ
  config HOTPLUG_CPU
        def_bool n
  
- mainmenu "Panasonic MN10300/AM33 Kernel Configuration"
 -config HZ
 -      int
 -      default 1000
--
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"

diff --cc arch/parisc/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/tile/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge