Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Mon, 4 Oct 2010 13:40:30 +0000 (13:40 +0000)
committerMichal Marek <mmarek@suse.cz>
Mon, 4 Oct 2010 13:40:30 +0000 (13:40 +0000)

Trivial merge