Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 7 Jan 2011 14:47:49 +0000 (14:47 +0000)
committerMichal Marek <mmarek@suse.cz>
Fri, 7 Jan 2011 14:47:49 +0000 (14:47 +0000)

Trivial merge