git.maquefel.me Git - linux.git/commit

author	Simon Horman <horms+renesas@verge.net.au>
	Tue, 11 Jun 2013 05:58:57 +0000 (14:58 +0900)
committer	Simon Horman <horms+renesas@verge.net.au>
	Tue, 11 Jun 2013 05:58:57 +0000 (14:58 +0900)
commit	ae8b378faea7f04d4517b22f5d70d824adcbc4dc
tree	54f50bcbd0baa55be24ac7ffbf547b4b55d046a4	tree \| snapshot
parent	5fcf4a3c3a5bc08bf72a50ef1332501a3c1b96bb	commit \| diff
parent	413bfd0e67894c930242482cd15ac09a800e2ab8	commit \| diff

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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

arch/arm/mach-shmobile/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/include/mach/r8a7778.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-r8a7778.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-sh73a0.c	diff1 \|	diff2 \|	blob \| history