Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 4 May 2011 20:52:36 +0000 (20:52 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 4 May 2011 20:52:36 +0000 (20:52 +0000)

Trivial merge