Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
authorMichal Marek <mmarek@suse.cz>
Mon, 25 Feb 2013 20:50:05 +0000 (21:50 +0100)
committerMichal Marek <mmarek@suse.cz>
Mon, 25 Feb 2013 20:51:57 +0000 (21:51 +0100)
commite3900e74f26fc924c8e9e2a922bd40369b0bb517
tree6e868575d346032ba9408f350c6e5369e0e52b0d
parent62dc989921df2a98d1a73aacd085abe941cb9828
parent02f3e53a131c8aa3fe3c954058f1add5beeae621
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

There is one kconfig fix in the rc-fixes branch that I forgot to submit
for 3.8, so let's add it to the kconfig branch for 3.9-rc1.
scripts/kconfig/mconf.c
scripts/kconfig/menu.c