Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Thu, 28 Oct 2010 20:46:00 +0000 (20:46 +0000)
committerMichal Marek <mmarek@suse.cz>
Thu, 28 Oct 2010 20:46:00 +0000 (20:46 +0000)

Trivial merge