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

Trivial merge