Merge branch 'kconfig' into for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 17 Sep 2010 16:21:05 +0000 (16:21 +0000)
committerMichal Marek <mmarek@suse.cz>
Fri, 17 Sep 2010 16:21:05 +0000 (16:21 +0000)

Trivial merge