From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 12 Jun 2015 20:18:38 +0000 (+0100)
Subject: Merge branch 'bsym' into for-next
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~100^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05c9ca8843cdf688275df891d512e204359717c5;p=pandora-kernel.git

Merge branch 'bsym' into for-next

Conflicts:
	arch/arm/kernel/head.S
---

05c9ca8843cdf688275df891d512e204359717c5
Reading git-diff-tree failed