Merge tag 'at91-ab-4.16-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Fri, 5 Jan 2018 07:31:40 +0000 (23:31 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 5 Jan 2018 07:31:40 +0000 (23:31 -0800)
drivers for 4.16

 - use PTR_ERR_OR_ZERO were relevant in at91_cf

* tag 'at91-ab-4.16-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  pcmcia: at91_cf: Use PTR_ERR_OR_ZERO()

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

Trivial merge