]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas...
authorOlof Johansson <olof@lixom.net>
Wed, 17 Oct 2012 15:08:22 +0000 (08:08 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 17 Oct 2012 15:08:22 +0000 (08:08 -0700)
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


Trivial merge