Searched hist:ae8b378f (Results 1 – 2 of 2) sorted by relevance
| /openbmc/linux/arch/arm/mach-shmobile/ |
| H A D | setup-r8a7778.c | ae8b378f Tue Jun 11 00:58:57 CDT 2013 Simon Horman <horms+renesas@verge.net.au> Merge branches 'heads/pinmux' and 'heads/soc' into phy-rcar-usb-base
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
|
| H A D | Kconfig | ae8b378f Tue Jun 11 00:58:57 CDT 2013 Simon Horman <horms+renesas@verge.net.au> Merge branches 'heads/pinmux' and 'heads/soc' into phy-rcar-usb-base
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
|