Merge branch 'kbuild/kconfig' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Tue, 3 Aug 2010 12:23:30 +0000 (14:23 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 3 Aug 2010 12:23:30 +0000 (14:23 +0200)
Conflicts:
scripts/kconfig/Makefile


Trivial merge