From: Alexander Graf <agraf@suse.de>
Date: Wed, 31 Oct 2012 12:36:18 +0000 (+0100)
Subject: Merge commit 'origin/queue' into for-queue
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~27^2~42^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0588000eac9ba4178cebade437da3b28e8fad48f;p=pandora-kernel.git

Merge commit 'origin/queue' into for-queue

Conflicts:
	arch/powerpc/include/asm/Kbuild
	arch/powerpc/include/uapi/asm/Kbuild
---

0588000eac9ba4178cebade437da3b28e8fad48f
Reading git-diff-tree failed