tree 96a36947d90c9b96580899abd38cb3b70cd9d40b
parent 7cf3d73b4360e91b14326632ab1aeda4cb26308d
parent 9fe6206f400646a2322096b56c59891d530e8d51
author Michal Marek <mmarek@suse.cz> 1280923507 +0200
committer Michal Marek <mmarek@suse.cz> 1280923507 +0200

Merge commit 'v2.6.35' into kbuild/kconfig

Conflicts:
	scripts/kconfig/Makefile