From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 15 May 2015 15:23:29 +0000 (+0200)
Subject: Merge tag 'rpi-dt-for-armsoc-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~1556^2~39
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d0d89bb6f438ca9a54b82c1ecf89e328d95b9652;p=firefly-linux-kernel-4.4.55.git

Merge tag 'rpi-dt-for-armsoc-v4.2' of git://git./linux/kernel/git/rpi/linux-rpi into next/dt

Merge "RaspberryPi Device Tree changes due for v4.2" from Lee Jones:

* tag 'rpi-dt-for-armsoc-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi:
  ARM: bcm2835: dt: Use 0x4 prefix for DMA bus addresses to SDRAM.
  ARM: bcm2835: dt: Add the mailbox to the device tree
  ARM: bcm2835: dt: Fix i2c0 node name
  ARM: bcm2835: dt: Use pinctrl header
  ARM: bcm2835: dt: Add header file for pinctrl constants
  ARM: bcm2835: dt: Add root properties for Raspberry Pi
  ARM: bcm2835: dt: Add vendor prefix for Raspberry Pi
---

d0d89bb6f438ca9a54b82c1ecf89e328d95b9652