Merge bk://linux-sam.bkbits.net/kbuild

into mars.ravnborg.org:/home/sam/src/linux/kernel/bk/v2.5

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm26/Kconfig
Simple merge

diff --cc arch/i386/Kconfig
Simple merge

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/m68k/Kconfig
Simple merge

diff --cc arch/parisc/Kconfig
Simple merge

diff --cc arch/ppc/Kconfig
Simple merge

diff --cc arch/ppc64/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/sparc64/Kconfig
Simple merge

diff --cc arch/um/Kconfig
Simple merge

diff --cc arch/x86_64/Kconfig
Simple merge