Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 13 Oct 2010 11:41:56 +0000 (11:41 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 13 Oct 2010 11:41:56 +0000 (11:41 +0000)

Trivial merge