Merge commit 'v2.6.35' into kbuild/kconfig
authorMichal Marek <mmarek@suse.cz>
Wed, 4 Aug 2010 12:05:07 +0000 (14:05 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 4 Aug 2010 12:05:07 +0000 (14:05 +0200)
Conflicts:
scripts/kconfig/Makefile


Trivial merge