git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fcf4a3 413bfd0)
Merge branches 'heads/pinmux' and 'heads/soc' into phy-rcar-usb-base
authorSimon Horman <horms+renesas@verge.net.au>
Tue, 11 Jun 2013 05:58:57 +0000 (14:58 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 11 Jun 2013 05:58:57 +0000 (14:58 +0900)
This branch acts as a base for adding USB support to
r8A7778/BOCK-W and r8A7779/Marzen.

It includes the soc branch to provide dependencies in
the r8A7778 clock code.

It includes pinmux to provide pinmux initialisation for Bock-W
which is a dependency.

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