Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 15 Apr 2011 13:33:19 +0000 (13:33 +0000)
committerMichal Marek <mmarek@suse.cz>
Fri, 15 Apr 2011 13:33:19 +0000 (13:33 +0000)

Trivial merge