Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 1 Sep 2010 15:39:12 +0000 (15:39 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 1 Sep 2010 15:39:12 +0000 (15:39 +0000)

Trivial merge