Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 2 Jul 2010 20:16:42 +0000 (20:16 +0000)
committerMichal Marek <mmarek@suse.cz>
Fri, 2 Jul 2010 20:16:42 +0000 (20:16 +0000)

Trivial merge