From: Simon Horman <horms@verge.net.au>
Date: Thu, 8 Nov 2012 08:49:35 +0000 (+0900)
Subject: Merge branch 'soc' into boards
X-Git-Tag: firefly_0821_release~3680^2~1449^2~5^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ab3ff12a78a64b851ab22726ab99dca6ad37bf94;p=firefly-linux-kernel-4.4.55.git

Merge branch 'soc' into boards

Conflicts:
	arch/arm/configs/marzen_defconfig
---

ab3ff12a78a64b851ab22726ab99dca6ad37bf94