Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Mon, 2 May 2011 15:40:38 +0000 (15:40 +0000)
committerMichal Marek <mmarek@suse.cz>
Mon, 2 May 2011 15:40:38 +0000 (15:40 +0000)

Trivial merge