git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c778879 5fcf4a3 413bfd0)
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)
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


Trivial merge
Pandora Kernel Repository