Merge tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni...
authorOlof Johansson <olof@lixom.net>
Thu, 1 Jun 2017 23:53:38 +0000 (16:53 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 2 Jun 2017 00:07:31 +0000 (17:07 -0700)
commitda3d1d4a4e6c554237466db060d53abbf0620605
tree46470fc6ac21ecab88ff7eadc1946056f0dc1c89
parentcf5cde2199058f1aed33f8b5f637c02a95936031
parentcc7a938f5f308eeb6f8fe3cec28e1800aa81facb
Merge tag 'at91-4.12-fixes' of git://git./linux/kernel/git/abelloni/linux into fixes

Fixes for 4.12:

Fix two compilation issues

* tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: at91: select CONFIG_ARM_CPU_SUSPEND
  memory: atmel-ebi: mark PM ops as __maybe_unused

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