From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Sep 2015 19:01:40 +0000 (-0700)
Subject: Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: firefly_0821_release~176^2~1187
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=00e3fcc221f6fe6a890bf3e0e71c6b9944e58233;p=firefly-linux-kernel-4.4.55.git

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

Pull ARM SoC non-urgent fixes from Olof Johansson:
 "We normally collect non-urgent fixes during the release cycle and
  queue them for the merge window.

  This time around the list is short (in part because some have gone in
  other branches).

   - Maintainers addition for bcm2835
   - IRQ number fix for orion5x (been present since 3.18)
   - DT fix for display on exynos3250
   - Exynos fix to use of IOMEM_ERR_PTR properly"

* tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: orion5x: fix legacy orion5x IRQ numbers
  MAINTAINERS: Explicitly add linux-arm-kernel for bcm2835
  MAINTAINERS: Add myself as a bcm2835 co-maintainer.
  ARM: EXYNOS: Use IOMEM_ERR_PTR when function returns iomem
  ARM: dts: fix clock-frequency of display timing0 for exynos3250-rinato
---

00e3fcc221f6fe6a890bf3e0e71c6b9944e58233