]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'heads/pinmux' into next
authorSimon Horman <horms+renesas@verge.net.au>
Wed, 15 May 2013 02:09:58 +0000 (11:09 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Wed, 15 May 2013 02:09:58 +0000 (11:09 +0900)
commitf6eca7ae25cce1328e5ebd06396aa6054f8ac5c3
tree16c9f05c9d83e25bf5015486f9f93d58b748a02e
parent496d44fdf3a809783647b84fc7d54b11e91825b3
parente25e9b695d970bb89ff74860474a5db02152af05
Merge branch 'heads/pinmux' into next

Conflicts:
arch/arm/mach-shmobile/clock-r8a7740.c
arch/arm/mach-shmobile/board-kzm9g-reference.c
arch/arm/mach-shmobile/board-kzm9g.c
arch/arm/mach-shmobile/clock-r8a7740.c
arch/arm/mach-shmobile/include/mach/r8a7740.h
arch/arm/mach-shmobile/setup-r8a7779.c
arch/arm/mach-shmobile/setup-r8a7790.c
drivers/pinctrl/sh-pfc/pfc-r8a7779.c
include/linux/platform_data/gpio-rcar.h