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

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

Conflicts:
	arch/powerpc/Makefile
---

1a7ba9260555b9e166702ca81c0f593b1c53b4b2
Reading git-diff-tree failed