From: Michal Marek <mmarek@suse.cz>
Date: Fri, 18 Jun 2010 12:33:37 +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=e198ba6773fe4f26385683e731c0ad844667ceeb;p=pandora-kernel.git

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

Conflicts:
	Makefile
---

e198ba6773fe4f26385683e731c0ad844667ceeb
Reading git-diff-tree failed