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)
* asm/dt:
  add Alphascale to vendor-prefixes.txt
  ARM: add alphascale,acc.txt bindings documentation
  ARM: dts: add DT for Alphascale ASM9260 SoC

1  2 
arch/arm/boot/dts/Makefile

Simple merge