| commit | 17bc093e18a6e7c453ebbfff81c74531e7933897 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sun Jun 18 23:12:36 2017 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Sun Jun 18 23:12:36 2017 -0700 |
| tree | 28afe4ad4d3ec877182802aea227666e9f9b8d15 | |
| parent | 67a87a94f9c8a7bf776a04821158b0c7913a5284 [diff] | |
| parent | cc7a938f5f308eeb6f8fe3cec28e1800aa81facb [diff] |
Merge tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc Bring in the fixes branch to avoid a merge conflict between new SoC options and the build fix adding CONFIG_AMR_CPU_SUSPEND. 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>