]> git.karo-electronics.de Git - linux-beck.git/commit
Merge tags 'renesas-pinmux-for-v3.11' and 'renesas-soc-for-v3.11' into cleanup
authorSimon Horman <horms+renesas@verge.net.au>
Thu, 13 Jun 2013 05:45:20 +0000 (14:45 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Thu, 13 Jun 2013 05:45:20 +0000 (14:45 +0900)
commit12dd9752512449f0336b7d64df3871145a28a2fe
tree54f50bcbd0baa55be24ac7ffbf547b4b55d046a4
parentc7788792a5e7b0d5d7f96d0766b4cb6112d47d75
parent5fcf4a3c3a5bc08bf72a50ef1332501a3c1b96bb
parent413bfd0e67894c930242482cd15ac09a800e2ab8
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
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/setup-r8a7778.c
arch/arm/mach-shmobile/setup-sh73a0.c