Merge tag 'at91-ab-4.11-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Thu, 19 Jan 2017 00:16:59 +0000 (16:16 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 19 Jan 2017 00:16:59 +0000 (16:16 -0800)
Drivers for 4.11:

 - atmel-ebi: Fix ns <-> cycles conversions

* tag 'at91-ab-4.11-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  memory/atmel-ebi: Fix ns <-> cycles conversions

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

Trivial merge