diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-06-13 07:45:20 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-06-13 07:45:20 +0200 |
| commit | 12dd9752512449f0336b7d64df3871145a28a2fe (patch) | |
| tree | 54f50bcbd0baa55be24ac7ffbf547b4b55d046a4 /drivers/pinctrl | |
| parent | Linux 3.10-rc2 (diff) | |
| parent | ARM: shmobile: marzen: Use RCAR_GP_PIN macro (diff) | |
| parent | ARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate (diff) | |
| download | linux-12dd9752512449f0336b7d64df3871145a28a2fe.tar.xz linux-12dd9752512449f0336b7d64df3871145a28a2fe.zip | |
Merge tags 'renesas-pinmux-for-v3.11' and 'renesas-soc-for-v3.11' into cleanup
This merge has been performed in order to provide the pre-requisites for
a cleanup patch for the lager board to annotate various structures
with __initdata.
Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/setup-r8a7778.c