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)
commit809609a5d8427b0025304dbb69a84a692d11c4f9
tree95a544cda32d36e4a9ee1ce27c527406c54d91b4
parenta4339a9cb46644e19278e4dd5d89b262a37cb0b0
parent8585deb18580d04209a2986430aa0959ef38fce2
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