]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
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)
1  2 
arch/arm/mach-shmobile/board-marzen.c

Simple merge