Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Sat, 14 Aug 2010 22:37:40 +0000 (22:37 +0000)
committerMichal Marek <mmarek@suse.cz>
Sat, 14 Aug 2010 22:37:40 +0000 (22:37 +0000)

Trivial merge