Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Mon, 13 Sep 2010 15:18:25 +0000 (15:18 +0000)
committerMichal Marek <mmarek@suse.cz>
Mon, 13 Sep 2010 15:18:25 +0000 (15:18 +0000)

Trivial merge