Merge tag 'arm-soc/for-4.2/dts-part3' of https://github.com/Broadcom/stblinux into...
authorKevin Hilman <khilman@linaro.org>
Wed, 10 Jun 2015 23:07:41 +0000 (16:07 -0700)
committerKevin Hilman <khilman@linaro.org>
Wed, 10 Jun 2015 23:07:41 +0000 (16:07 -0700)
This pull request contains Broadcom BCM5301x related changes:

- Hauke adds the interrupt mapping for the BCM5301x PCIe controller

- Haule adds support for NAND flash using the standard Broadcom NAND controller
  iProc specific binding on BCM4708/5301x

- Rafal adds support for the Asus RT-AC87U router

* tag 'arm-soc/for-4.2/dts-part3' of https://github.com/Broadcom/stblinux:
  ARM: BCM5301X: Add DT for Asus RT-AC87U
  ARM: BCM5301X: add IRQ numbers for PCIe controller
  ARM: BCM5301X: add NAND flash chip description

1  2 
arch/arm/boot/dts/Makefile

Simple merge