Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Tue, 21 Dec 2010 16:59:59 +0000 (16:59 +0000)
committerMichal Marek <mmarek@suse.cz>
Tue, 21 Dec 2010 16:59:59 +0000 (16:59 +0000)

Trivial merge