]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit47de34f51289b93e853362053d00b85e68bd5f88
tree46470fc6ac21ecab88ff7eadc1946056f0dc1c89
parentc9e1e6b55c95ea434808c1bfee31f0a17d58547f
parent6d18579be993e1f348a573a46cd18c84eed26f1f
Merge tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/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>