FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-25 19:07:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
c13ee2a4f0
linux/arch/arm/mach-at91
History
Olof Johansson 17bc093e18 Fixes for 4.12: 
Fix two compilation issues
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEXx9Viay1+e7J/aM4AyWl4gNJNJIFAlkr5k8ACgkQAyWl4gNJ
 NJLWOxAAiuIGE68UnDq/C77RB8ETHvXJoJgdmj6RTTP1RCwioMBicWWuBFR20a10
 1RNQ4hVqWQbQlW0KNWZrdO50eWJKS4o47GKQ2qkkK9oYn8JSFaptGi6rqU+mVCVv
 GrBKZQczIBMa2JPgSYXyJu/NWtAPWr807LRujGEbDRmAMpid9mDnCG07cL83WYY5
 8pi8lT/vKSWK/wl/LjF6wdTmKoF1vFd4TKk7xGYvvJiUT1kgt6jEWXa52IUGCJJn
 UtJD97vJwBkR1vxx0ocRiHnuN8OD2OjewJ61S1kGRvBIQZazHcBneSl70dPp11IJ
 Hc1WKLiNI04/seHCVFvS74TxZLujR19f7sKXO3yp+9aXv+DJyTDJcfKT2LY3uACr
 Uf+kmyIgOmoMQCIO8xhj6AM9nJs6MpRZuy4oKjGnsr3iOs3cZmmV5lhercd6ZlH3
 oXSPXPeNJox9buig+Pxno8ugcfaJChEH5DxAyfUpnC4mLvjcWGXIVLB8jtbj0H7C
 9JjNbyjYem0wFc45ySjCePs+nrnIYLhaKbm1V6T0IUzeJB46bMfiNLo7dg50d6AD
 tZzEn7Br0zHVXs0TpfmUqdpyFEv6N+jJlz4UNQiN74lHVLBpcmf7LoeavreGIg+i
 YbXLPtHwAtE1eYLQGo3lUiNnaJIKA8V8ErMpuL7vexgSX3/STgk=
 =P9hB
 -----END PGP SIGNATURE-----

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>
2017-06-18 23:12:36 -07:00
..
at91rm9200.c ARM: at91: move SoC detection to its own driver 2017-03-31 20:36:10 +02:00
at91sam9.c ARM: at91: move SoC detection to its own driver 2017-03-31 20:36:10 +02:00
generic.h ARM: at91: pm: Add sama5d2 backup mode 2017-05-15 11:55:17 +02:00
Kconfig Fixes for 4.12: 2017-06-18 23:12:36 -07:00
Makefile ARM: at91: handle CONFIG_PM for armv7m configurations 2017-06-02 10:11:44 +02:00
Makefile.boot ARM: at91: Add armv7m support 2017-06-02 10:11:38 +02:00
pm_data-offsets.c ARM: at91: pm: Add sama5d2 backup mode 2017-05-15 11:55:17 +02:00
pm_suspend.S ARM: at91: pm: Add sama5d2 backup mode 2017-05-15 11:55:17 +02:00
pm.c SoC for 4.13: 2017-06-18 22:53:20 -07:00
pm.h ARM: at91: pm: allow selecting standby and suspend modes 2017-05-15 11:55:24 +02:00
sama5.c ARM: at91: pm: Add sama5d2 backup mode 2017-05-15 11:55:17 +02:00
samv7.c ARM: at91: fix at91_suspend_entering_slow_clock link error 2017-06-13 11:51:11 +02:00