]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 15 Dec 2010 22:50:38 +0000 (22:50 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 15 Dec 2010 22:50:38 +0000 (22:50 +0000)
1  2 
scripts/kconfig/menu.c

Simple merge