Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 15 Dec 2010 13:45:26 +0000 (13:45 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 15 Dec 2010 13:45:26 +0000 (13:45 +0000)

Trivial merge