kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-11-13 07:31:07 +00:00
Code Issues Releases Packages Activity

Merge branches 'heads/pinmux' and 'heads/soc' into phy-rcar-usb-base

Browse source 
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
This commit is contained in:
Simon Horman 2013-06-11 14:58:57 +09:00
commit ae8b378fae
11 changed files with 924 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files