Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 29 Apr 2011 12:01:06 +0000 (12:01 +0000)
committerMichal Marek <mmarek@suse.cz>
Fri, 29 Apr 2011 12:01:06 +0000 (12:01 +0000)

Trivial merge