Olof Johansson e17fd8e58a Samsung fixes for v3.18 ... - fix ifdef around cpu_*_do_[suspend, resume] ops to check CONFIG_ARM_CPU_SUSPEND and not CONFIG_PM_SLEEP - fix exynos_defconfig build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n - fix enabling Samsung PM debug functionality due to recently merged patches and previous merge conflicts - fix pull-up setting in sd4_width8 pin group for exynos4x12 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJUPa89AAoJEA0Cl+kVi2xqDagP+gJMTHKBbGi6VUAGnV+6ojCa LgXjaCKfPlHFJ9C4d8OvW2g3Fc+3Ns/Tm2s93AWNz+NEJo4Ft5OZW+jHzIMF1Viz lAewxzoAgq5CeseyvmzUQ5aCVglzCGvgQ6WN9Lq1sRqD8BywHYDRpmrxmDGjGN0D 51pIxgEJLRYsOsJVhIx1wBBWTxaQH2ViqACsak+HJkw0WzoDQUVzSv85NlzaMwyR 55rikCPDC/RbSLI3McyNWx+BJ0bBy6HqXkfhFsTmROa0ewjPAR+miEKvF6Jqk6ij IZKpfD6hiHNuyhyQEpY3Mw5sOoleVLCuAM5x1f883b/ufISARGTZ0Zhb5+UQ2Rdh bf5bZw+ZuhMCZioN2tUgBCOUwRC/G+PGzy82Z46FQhp6e21VTwY345HhZfvIKHHy 10veTu8RGFm0Y2VL6rENHhWN6tZzOrmM0oeN4nEnZQfXy7tsRy6qFLYv30wuY2y4 6oPK6Vs1iB0BAz8HioAuupIFn8ZkfO4AoCW+Gu94Gt3n0dTOFP7JIBgjycvSxLb2 FV2Zt/DXxjAj+ld/jf6lOIIYw/0JyaB58QeLKdASQxmiUbUuoQt9STe/c6MS1miy j8BPM4ILuhak+0aFUgSRZiewoGyqXEShdinmdJ1B/k1JVmFiwgEOjT7tQTQeEiCn 4OPzu6fIYau0CdUqMy7w =6hVm -----END PGP SIGNATURE----- Merge tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes Merge "Samsung fixes for v3.18" from Kukjin Kim: - fix ifdef around cpu_*_do_[suspend, resume] ops to check CONFIG_ARM_CPU_SUSPEND and not CONFIG_PM_SLEEP - fix exynos_defconfig build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n - fix enabling Samsung PM debug functionality due to recently merged patches and previous merge conflicts - fix pull-up setting in sd4_width8 pin group for exynos4x12 * tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: mm: Fix ifdef around cpu_*_do_[suspend, resume] ops ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n ARM: SAMSUNG: Restore Samsung PM Debug functionality ARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12 Signed-off-by: Olof Johansson <olof@lixom.net>		2014-10-14 23:31:13 -07:00
..
include/mach	ARM: EXYNOS: remove unused <mach/memory.h>	2014-08-18 09:04:05 -05:00
common.h	ARM: EXYNOS: Refactored code for using PMU address via DT	2014-07-23 08:20:30 +09:00
exynos-smc.S	ARM: EXYNOS: Add support for secure monitor calls	2013-04-09 01:52:06 +09:00
exynos.c	Samsung fixes for v3.18	2014-10-14 23:31:13 -07:00
firmware.c	ARM: EXYNOS: Update secondary boot addr for secure mode	2014-07-08 08:03:49 +09:00
headsmp.S	ARM: EXYNOS: Remove file path from comment section	2014-07-15 08:40:32 +09:00
hotplug.c	ARM: SoC cleanups for 3.17	2014-08-08 11:00:26 -07:00
Kconfig	ACPI and power management updates for 3.17-rc1	2014-08-06 20:34:19 -07:00
Makefile	kbuild: remove unnecessary variable initializaions	2014-10-02 13:55:02 +02:00
Makefile.boot	ARM: dts: Add basic dts file for Samsung Trats board	2012-09-21 10:50:27 +09:00
mcpm-exynos.c	ARM: 8129/1: errata: work around Cortex-A15 erratum 830321 using dummy strex	2014-08-27 15:40:13 +01:00
mfc.h	ARM: SAMSUNG: Reorganize calls to reserve memory for MFC	2014-03-21 02:00:09 +09:00
platsmp.c	ARM: EXYNOS: Do not calculate boot address twice	2014-09-14 02:31:19 +09:00
pm_domains.c	ARM: exynos: Move to generic PM domain DT bindings	2014-09-22 15:57:40 +02:00
pm.c	ARM: EXYNOS: Fix suspend/resume sequences	2014-08-09 08:24:36 -07:00
pmu.c	ARM: EXYNOS: Refactored code for using PMU address via DT	2014-07-23 08:20:30 +09:00
regs-pmu.h	ARM: EXYNOS: Refactored code for using PMU address via DT	2014-07-23 08:20:30 +09:00
regs-sys.h	ARM: EXYNOS: Move SYSREG definition into sys-reg specific file	2014-07-15 08:40:31 +09:00
sleep.S	ARM: l2c: exynos: convert to common l2c310 early resume functionality	2014-05-30 00:49:12 +01:00
smc.h	ARM: EXYNOS: Add support for secure monitor calls	2013-04-09 01:52:06 +09:00