Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Tue, 24 May 2011 15:16:38 +0000 (15:16 +0000)
committerMichal Marek <mmarek@suse.cz>
Tue, 24 May 2011 15:16:38 +0000 (15:16 +0000)

Trivial merge