Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Thu, 29 Jul 2010 14:57:27 +0000 (14:57 +0000)
committerMichal Marek <mmarek@suse.cz>
Thu, 29 Jul 2010 14:57:27 +0000 (14:57 +0000)

Trivial merge