Merge tag 'renesas-fixes2-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Wed, 14 Aug 2013 07:59:27 +0000 (00:59 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 14 Aug 2013 07:59:46 +0000 (00:59 -0700)
commit4319f78f422eb391bd7d63ccedbb8a2b1ab059df
tree6cd4a4120d013ace44f8df745be734848c847105
parentea04dd3b47aa0bb941285d2ea671fe332774e66d
parentab40900b70dc31a64f23b1b4dbb0917afb039775
Merge tag 'renesas-fixes2-for-v3.12' of git://git./linux/kernel/git/horms/renesas into next/fixes-non-critical

From Simon Horman:
Second Round of Renesas ARM based SoC fixes for v3.12

* Fix compiler warning in armadillo800eva board code

* tag 'renesas-fixes2-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: armadillo800eva-reference: fix compiler warning

Signed-off-by: Olof Johansson <olof@lixom.net>