Merge tag 'ox810se-arm-dt-v4.6-rc3' of https://github.com/superna9999/linux into...
authorArnd Bergmann <arnd@arndb.de>
Tue, 26 Apr 2016 11:41:51 +0000 (13:41 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 26 Apr 2016 11:41:51 +0000 (13:41 +0200)
commit6945248f34b95330700f3d2632608457abaddb18
treef5725a60e53659d3fecab9d1ae72b1e8ea7682ef
parent1fb75865d8b80b216a6f540b32f6cd1480f8c843
parent0767a5cb425374aafa89d33d6b1190a01d7f6b0e
Merge tag 'ox810se-arm-dt-v4.6-rc3' of https://github.com/superna9999/linux into next/dt

Merge "ARM: dts: Add OXNAS Platform Bindings" from Neil Armstrong:

* tag 'ox810se-arm-dt-v4.6-rc3' of https://github.com/superna9999/linux:
  ARM: boot: dts: Add Western Digital My Book World Edition device tree
  dt-bindings: Add Western Digital to vendor prefixes
  dt-bindings: Add OXNAS bindings
  ARM: boot: dts: Add Oxford Semiconductor OX810SE dtsi
  dt-bindings: Add Oxford Semiconductor to vendor prefixes
  dt-bindings: irq: arm,versatile-fpga: add compatible string for OX810SE SoC
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/boot/dts/Makefile