From: Olof Johansson Date: Thu, 29 Jan 2015 22:04:22 +0000 (-0800) Subject: Merge tag 'zynq-soc-for-3.20' of https://github.com/Xilinx/linux-xlnx into next/soc X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ee481c84fa0675c94fd4443f6da5be836664d821;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge tag 'zynq-soc-for-3.20' of https://github.com/Xilinx/linux-xlnx into next/soc Merge "Zynq SoC changes for 3.20" from Michal Simek: arm: Xilinx Zynq SoC patches for v3.20 - Enable pincontrol - Simplified SLCR initialization - Setup default ARCH_NR_GPIO * tag 'zynq-soc-for-3.20' of https://github.com/Xilinx/linux-xlnx: ARM: zynq: Simplify SLCR initialization ARM: zynq: PM: Fixed simple typo. ARM: zynq: Setup default gpio number for Xilinx Zynq ARM: zynq: Enable pinctrl Signed-off-by: Olof Johansson --- ee481c84fa0675c94fd4443f6da5be836664d821