diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-18 23:12:36 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 23:12:36 -0700 |
| commit | 17bc093e18a6e7c453ebbfff81c74531e7933897 (patch) | |
| tree | 28afe4ad4d3ec877182802aea227666e9f9b8d15 /tools/perf/scripts/python | |
| parent | Merge tag 'imx-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sha... (diff) | |
| parent | ARM: at91: select CONFIG_ARM_CPU_SUSPEND (diff) | |
| download | linux-17bc093e18a6e7c453ebbfff81c74531e7933897.tar.gz linux-17bc093e18a6e7c453ebbfff81c74531e7933897.zip | |
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>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions