Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
authorMichal Marek <mmarek@suse.cz>
Tue, 12 Oct 2010 13:09:06 +0000 (15:09 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 12 Oct 2010 13:09:06 +0000 (15:09 +0200)
commit239060b93bb30a4ad55f1ecaa512464a035cc5ba
tree77f79810e57d4fc24356eca0cd6db463e8994128
parent1408b15b98635a13bad2e2a50b3c2ae2ccdf625b
parente9203c988234aa512bd45ca32b52e21c7bbfc414
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

We need to revert the temporary hack in 71ebc01, hence the merge.
27 files changed:
arch/alpha/Kconfig
arch/arm/Kconfig
arch/avr32/Kconfig
arch/blackfin/Kconfig
arch/cris/Kconfig
arch/frv/Kconfig
arch/h8300/Kconfig
arch/ia64/Kconfig
arch/m32r/Kconfig
arch/m68k/Kconfig
arch/m68knommu/Kconfig
arch/microblaze/Kconfig
arch/mips/Kconfig
arch/mn10300/Kconfig
arch/parisc/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/score/Kconfig
arch/sh/Kconfig
arch/sparc/Kconfig
arch/um/Kconfig.common
arch/x86/Kconfig
arch/xtensa/Kconfig
scripts/kconfig/conf.c
scripts/kconfig/expr.h
scripts/kconfig/menu.c
scripts/kconfig/symbol.c