From: Olof Johansson <olof@lixom.net>
Date: Tue, 9 Oct 2012 15:48:51 +0000 (-0700)
Subject: Merge branch 'fixes2' into fixes
X-Git-Tag: firefly_0821_release~3680^2~1842^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=782cd9ee985b1523f1ddad57657a24d7855d9e4d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes2' into fixes

Three more warnings fixes from Arnd Bergmann:

* fixes2:
  ARM: integrator: use __iomem pointers for MMIO, part 2
  ARM: assabet: fix bogus warning in get_assabet_scr (again)
  ARM: shmobile: mark shmobile_init_late as __init
---

782cd9ee985b1523f1ddad57657a24d7855d9e4d