From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 30 Dec 2012 17:58:36 +0000 (-0800)
Subject: Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: firefly_0821_release~3680^2~1332
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4fe2dfabe48edb799065d05fe96bfb7745cd5688;p=firefly-linux-kernel-4.4.55.git

Merge tag 'fixes' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "It's been quiet over the holidays, but we have had a couple of trivial
  fixes coming in for the newly introduced sunxi platform; one to add it
  to the multiplatform defconfig for build coverage, and one fixup for
  device tree strings."

* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  sunxi: Change the machine compatible string.
  ARM: multi_v7_defconfig: Add ARCH_SUNXI
---

4fe2dfabe48edb799065d05fe96bfb7745cd5688