Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Thu, 8 Jul 2010 12:38:43 +0000 (12:38 +0000)
committerMichal Marek <mmarek@suse.cz>
Thu, 8 Jul 2010 12:38:43 +0000 (12:38 +0000)

Trivial merge