Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfig
authorMichal Marek <mmarek@suse.cz>
Tue, 24 May 2011 15:16:21 +0000 (17:16 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 24 May 2011 15:16:21 +0000 (17:16 +0200)

Trivial merge