Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Thu, 12 Aug 2010 22:53:02 +0000 (22:53 +0000)
committerMichal Marek <mmarek@suse.cz>
Thu, 12 Aug 2010 22:53:02 +0000 (22:53 +0000)

Trivial merge