From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 16 Mar 2015 14:35:25 +0000 (+0100)
Subject: Merge tag 'arm-soc/for-4.1/devicetree-part-2' of http://github.com/broadcom/stblinux... 
X-Git-Tag: omap-for-v4.1/fixes-rc1~63^2~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2effbad526869faa7fd61136819a548e0d1966f1;p=pandora-kernel.git

Merge tag 'arm-soc/for-4.1/devicetree-part-2' of github.com/broadcom/stblinux into next/dt

Pull "This pull request contains the following changes from Ray for Cygnus SoCs: from Florian Fainelli:

- enable IOMUX, required for pinmux/pinctrl
- enable GPIO, required for the GPIO driver
- enable GPIO hook detection for BCM911360-based phone designs
- enable PCIe controller for the bcm958300k designs

* tag 'arm-soc/for-4.1/devicetree-part-2' of http://github.com/broadcom/stblinux:
  ARM: dts: enable PCIe support for Cygnus
  ARM: dts: cygnus: enable GPIO based hook detection
  ARM: dts: enable GPIO for Broadcom Cygnus
  ARM: dts: enable IOMUX for Broadcom Cygnus
---

2effbad526869faa7fd61136819a548e0d1966f1
Reading git-diff-tree failed