Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 8 Sep 2010 11:57:14 +0000 (11:57 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 8 Sep 2010 11:57:14 +0000 (11:57 +0000)

Trivial merge