Merge branch 'asm/dt' into next/dt
authorOlof Johansson <olof@lixom.net>
Tue, 20 Jan 2015 00:30:48 +0000 (16:30 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 20 Jan 2015 00:30:48 +0000 (16:30 -0800)
commit85027a6792767587a8a2bb11d41db415dd5f9d00
tree64fe0da6d712631dd8f8ae6969605d86734e5585
parent606d5313365a2f03af33553abed5637f543f85dd
parent03ed8470575bad95e8360108183cff5ca0c8e44e
Merge branch 'asm/dt' into next/dt

* asm/dt:
  add Alphascale to vendor-prefixes.txt
  ARM: add alphascale,acc.txt bindings documentation
  ARM: dts: add DT for Alphascale ASM9260 SoC
arch/arm/boot/dts/Makefile