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)
commit7a996d3ab150bb0e1b71fa182f70199a703efdd1
tree96a36947d90c9b96580899abd38cb3b70cd9d40b
parent7cf3d73b4360e91b14326632ab1aeda4cb26308d
parent9fe6206f400646a2322096b56c59891d530e8d51
Merge commit 'v2.6.35' into kbuild/kconfig

Conflicts:
scripts/kconfig/Makefile
Documentation/kbuild/kconfig.txt
scripts/kconfig/Makefile