Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Mon, 27 Dec 2010 20:49:27 +0000 (20:49 +0000)
committerMichal Marek <mmarek@suse.cz>
Mon, 27 Dec 2010 20:49:27 +0000 (20:49 +0000)

Trivial merge