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)
commit0ff6454b2aa09c5ec0ba9007704a7706d476e2c8
treeb6bdf1e0dae0c02cfba0b48436a7adbea7e70b43
parenta121103c922847ba5010819a3f250f1f7fc84ab8
parentee194289502a6901cc77dc9a893bf2afd351ac5e
Merge tag 'at91-ab-4.11-drivers' of git://git./linux/kernel/git/abelloni/linux into next/drivers

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>