From: Michal Marek <mmarek@suse.cz>
Date: Tue, 3 Aug 2010 12:23:30 +0000 (+0200)
Subject: Merge branch 'kbuild/kconfig' into kbuild/for-next
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d21f418a8af887f77bf08135c434bee5098dd63;p=pandora-kernel.git

Merge branch 'kbuild/kconfig' into kbuild/for-next

Conflicts:
	scripts/kconfig/Makefile
---

1d21f418a8af887f77bf08135c434bee5098dd63
Reading git-diff-tree failed