From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 21 May 2012 14:15:33 +0000 (+0100)
Subject: Merge branch 'v3-removal' into for-linus
X-Git-Tag: firefly_0821_release~3680^2~2860^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4ab1056766a4e49f6b9ef324313dd1583f8f8f4e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'v3-removal' into for-linus

Conflicts:
	arch/arm/boot/compressed/head.S
---

4ab1056766a4e49f6b9ef324313dd1583f8f8f4e