Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Tue, 19 Apr 2011 07:23:29 +0000 (07:23 +0000)
committerMichal Marek <mmarek@suse.cz>
Tue, 19 Apr 2011 07:23:29 +0000 (07:23 +0000)

Trivial merge