Merge branch 'renesas/pinmux-gpio' into next/boards
authorOlof Johansson <olof@lixom.net>
Tue, 11 Jun 2013 07:32:20 +0000 (00:32 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 11 Jun 2013 07:32:20 +0000 (00:32 -0700)
commit9ee73aec3570733dc3b9a6b4782db6b323abfa5e
tree82626b8205e1f495878428e7bb5b49acf3d651ab
parentb52e79152f35379a6bb5b800dcf796209fdebd02
parent5fcf4a3c3a5bc08bf72a50ef1332501a3c1b96bb
Merge branch 'renesas/pinmux-gpio' into next/boards
arch/arm/mach-shmobile/board-marzen.c