]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
projects / mirror_ubuntu-artful-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf5cde2 cc7a938)
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)
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>

Trivial merge
Ubuntu Artful kernel mirror