Linus Walleij 7f36f5d11c Linux 4.10-rc6 ... -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJYjmvUAAoJEHm+PkMAQRiGHIoH/3VaTj7cCJZDnWZ2Wi2enWip f17zj0oAkFxuSx8XEVD5BKqMfGBCBjPNPwURysfcFVoSHNtHjbEr44VxiPfQj5s2 N+znVm5P9qlFuRA+7dgYUyEKOqcTgyT9jFNpvPF6bgMZDfJoB/wo53UU4lo3drcx cRe6OT4fEpAbtgbl73kIjOreBRr7oxlMPVEjCVRdL7ssCg+iqow0MEHcSoO7jmtj tu8hwwBMNh5B0yJRCJKV7Edc1+GHK57ju6rnGr5S2rwnR31omLpvnHJx0Ya6NVCZ yV3KGQeWm13ifbumMddEnAL61x2hOIzX//BqaZKdy258YPohkNtD8oacnjHnLMc= =5Rs+ -----END PGP SIGNATURE----- Merge tag 'v4.10-rc6' into devel Linux 4.10-rc6 Resolved conflicts in: drivers/pinctrl/pinctrl-amd.c drivers/pinctrl/samsung/pinctrl-exynos.c		2017-01-30 14:39:20 +01:00
..
include/mach	ARM: EXYNOS: Remove unused DMC and CMU offsets and their mappings	2016-08-24 06:42:27 +02:00
common.h	ARM: SAMSUNG: Fix missing s5p_init_cpu() declaration	2016-06-22 12:33:14 +02:00
exynos-smc.S	ARM: EXYNOS: Add support for secure monitor calls	2013-04-09 01:52:06 +09:00
exynos.c	ARM: EXYNOS: Remove unused DMC and CMU offsets and their mappings	2016-08-24 06:42:27 +02:00
firmware.c	ARM: EXYNOS: Fixups for big-endian operation	2016-06-21 13:25:58 +02:00
headsmp.S	ARM: EXYNOS: Fixups for big-endian operation	2016-06-21 13:25:58 +02:00
Kconfig	ARM: SoC platform updates for v4.9	2016-10-07 21:18:42 -07:00
Makefile	Topic branch for Exynos MFC changes for v4.8:	2016-06-19 22:39:15 -07:00
mcpm-exynos.c	ARM: EXYNOS: Move pmu specific headers under "linux/soc/samsung"	2016-02-25 10:13:36 +09:00
platsmp.c	ARM: EXYNOS: Remove smp_init_cpus hook from platsmp.c	2016-11-05 17:37:10 +02:00
pm.c	ARM: EXYNOS: Fixup endian in pm/pmu	2016-06-21 13:26:31 +02:00
sleep.S	ARM: 8325/1: exynos: move resume code to .text section	2015-03-29 23:11:57 +01:00
smc.h	ARM: EXYNOS: add AFTR mode support for Exynos3250	2015-03-27 02:35:48 +09:00
suspend.c	pinctrl: samsung: Move retention control from mach-exynos to the pinctrl driver	2017-01-26 16:56:57 +01:00