Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Mon, 18 Apr 2011 13:03:20 +0000 (13:03 +0000)
committerMichal Marek <mmarek@suse.cz>
Mon, 18 Apr 2011 13:03:20 +0000 (13:03 +0000)

Trivial merge