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)
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.

1  2 
scripts/kconfig/mconf.c
scripts/kconfig/menu.c

Simple merge
Simple merge