From: Olof Johansson <olof@lixom.net>
Date: Wed, 17 Oct 2012 15:08:22 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas... 
X-Git-Tag: firefly_0821_release~3680^2~1703^2~20
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=69648ae885e7de8be223362ea6e95c79066069e7;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes' of git://git./linux/kernel/git/horms/renesas into fixes

From Simon Horman:
"Please consider the following fix for the KZM-A9-GT board for 3.7.
 They both resolve fallout from recent IOMEM() changes."

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7779: use __iomem pointers for MMIO
  ARM: shmobile: armadillo800eva: __io abuse cleanup
---

69648ae885e7de8be223362ea6e95c79066069e7