]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'soc' into pinmux-base
authorSimon Horman <horms+renesas@verge.net.au>
Tue, 2 Apr 2013 02:08:34 +0000 (11:08 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 2 Apr 2013 02:08:34 +0000 (11:08 +0900)
commit2d92a970b31aadcab731161706047872b8b66ff0
tree95a544cda32d36e4a9ee1ce27c527406c54d91b4
parentc7d00e8cbdf7662750decadc9461f54dd2c8874a
parent773b88148a8aba2aa19fc4a3f718f9d7308e9f70
Merge branch 'soc' into pinmux-base

Conflicts:
drivers/pinctrl/sh-pfc/pfc-r8a7740.c

This merge is to provide r8a73a4 SoC files, which are added in the
soc branch and depended on by r8a73a4 pfc-changes which are to
be added to the pinmux branch.
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-kzm9g.c
arch/arm/mach-shmobile/include/mach/r8a7740.h
arch/arm/mach-shmobile/include/mach/r8a7779.h
arch/arm/mach-shmobile/include/mach/sh7372.h
arch/arm/mach-shmobile/include/mach/sh73a0.h
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
drivers/pinctrl/sh-pfc/pfc-sh73a0.c