Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Thu, 2 Dec 2010 16:04:33 +0000 (16:04 +0000)
committerMichal Marek <mmarek@suse.cz>
Thu, 2 Dec 2010 16:04:33 +0000 (16:04 +0000)

Trivial merge