From: Simon Horman <horms+renesas@verge.net.au>
Date: Tue, 11 Jun 2013 05:58:57 +0000 (+0900)
Subject: Merge branches 'heads/pinmux' and 'heads/soc' into phy-rcar-usb-base
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~71^2~32^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae8b378faea7f04d4517b22f5d70d824adcbc4dc;p=pandora-kernel.git

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
---

ae8b378faea7f04d4517b22f5d70d824adcbc4dc
Reading git-diff-tree failed