Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 27 Oct 2010 23:03:46 +0000 (23:03 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 27 Oct 2010 23:03:46 +0000 (23:03 +0000)

Trivial merge