Merge tag 'renesas-fixes2-for-v3.12' of...

Merge tag 'renesas-fixes2-for-v3.12' of git://git.kernel.org/pub/scm/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>