From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 14 Apr 2015 21:28:25 +0000 (+0100)
Subject: Merge branches 'misc', 'vdso' and 'fixes' into for-next
X-Git-Tag: omap-for-v4.1/fixes-rc1~142^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c848791f0336914a3081ea3fe029cf177d81de81;p=pandora-kernel.git

Merge branches 'misc', 'vdso' and 'fixes' into for-next

Conflicts:
	arch/arm/mm/proc-macros.S
---

c848791f0336914a3081ea3fe029cf177d81de81
Reading git-diff-tree failed