From: Olof Johansson <olof@lixom.net>
Date: Thu, 29 Aug 2013 17:49:03 +0000 (-0700)
Subject: Merge branch 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351 into next/dt
X-Git-Tag: v3.12-rc1~116^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=103c6a71207f80e6ecfeba2c21d6246687bb0ee4;p=linux-2.6-block.git

Merge branch 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351 into next/dt

From Christian Daudt, DT changes for Broadcom.

* 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351:
  ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
  ARM: dts: add sdio blocks to bcm28155-ap board
  ARM: dts: align sdio numbers to HW definition
  ARM: bcm281xx: DT changes for reboot code
  ARM: bcm281xx: Adding bcm28155-ap.dts
---

103c6a71207f80e6ecfeba2c21d6246687bb0ee4