Merge remote-tracking branch 'renesas/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 29 Feb 2016 21:32:05 +0000 (08:32 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 29 Feb 2016 21:32:05 +0000 (08:32 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Feb 2016 21:32:05 +0000 (08:32 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Feb 2016 21:32:05 +0000 (08:32 +1100)
diff --cc arch/arm64/Kconfig.platforms
Simple merge
diff --cc arch/arm64/configs/defconfig

index 0c713fedfe8b4115df3addea9f6fbebc6079bf93,eaf738a59927f103a57337950eac1f27a52a381e..73db43c2e71f31163054f7c89c45e08b593f9018
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -232,7 -213,7 +232,8 @@@ CONFIG_QCOM_SMD_RPM=
   CONFIG_ARCH_TEGRA_132_SOC=y
   CONFIG_ARCH_TEGRA_210_SOC=y
   CONFIG_HISILICON_IRQ_MBIGEN=y
+ +CONFIG_EXTCON_USB_GPIO=y
+ CONFIG_PHY_RCAR_GEN3_USB2=y
   CONFIG_PHY_XGENE=y
   CONFIG_EXT2_FS=y
   CONFIG_EXT3_FS=y
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 29 Feb 2016 21:32:05 +0000 (08:32 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 29 Feb 2016 21:32:05 +0000 (08:32 +1100)
		1	2
arch/arm64/Kconfig.platforms	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/configs/defconfig	patch \|	diff1 \|	diff2 \|	blob \| history