From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 5 Aug 2014 09:27:13 +0000 (+0100)
Subject: Merge branches 'fixes' and 'misc' into for-next
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~160^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7109561524dc57b95fd3f9b61547268b9b6db8ed;p=pandora-kernel.git

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

Conflicts:
	arch/arm/kernel/iwmmxt.S
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/mmu.c
---

7109561524dc57b95fd3f9b61547268b9b6db8ed
Reading git-diff-tree failed