Merge tag 'mvebu-drivers-4.6-1' of git://git.infradead.org/linux-mvebu into next/soc
authorOlof Johansson <olof@lixom.net>
Mon, 8 Feb 2016 21:54:16 +0000 (13:54 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 8 Feb 2016 21:54:16 +0000 (13:54 -0800)
mvebu driver for 4.6 (part 1)

implement ARM delay timer for orion

* tag 'mvebu-drivers-4.6-1' of git://git.infradead.org/linux-mvebu:
  ARM: orion: implement ARM delay timer

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge