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/plat	Merge branch 'cleanup/gpio-header-removal' into next/soc	2014-07-26 18:00:40 +02:00
adc.c	ARM: S5PC100: no more support S5PC100 SoC	2014-07-13 07:35:11 +09:00
cpu.c	ARM: SAMSUNG: Remove remaining legacy code	2014-07-19 04:32:18 +09:00
dev-backlight.c	ARM: SAMSUNG: remove GPIO flags in dev-backlight	2014-05-07 10:15:20 +02:00
dev-uart.c
devs.c	ARM: SAMSUNG: Remove remaining legacy code	2014-07-19 04:32:18 +09:00
dma-ops.c	ARM: s3c64xx: Add support for DMA using generic amba-pl08x driver	2013-11-24 14:38:24 +00:00
dma.c
init.c	ARM: SAMSUNG: Remove legacy clock code	2014-07-19 04:24:59 +09:00
Kconfig	ARM: SAMSUNG: Restore Samsung PM Debug functionality	2014-09-24 02:47:43 +09:00
Makefile	kbuild: remove unnecessary variable initializaions	2014-10-02 13:55:02 +02:00
platformdata.c	ARM: SAMSUNG: remove all uses of clk_type member in sdhci platform data	2012-04-21 08:24:56 -07:00
pm-check.c	ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h	2014-03-21 04:09:26 +09:00
pm-common.c	ARM: SAMSUNG: Move common save/restore helpers to separate file	2014-03-21 04:09:25 +09:00
pm-debug.c	ARM: SAMSUNG: Restore Samsung PM Debug functionality	2014-09-24 02:47:43 +09:00
pm-gpio.c	Merge branch 'cleanup/gpio-header-removal' into next/soc	2014-07-26 18:00:40 +02:00
pm.c	Samsung PM related 2nd updates for v3.15	2014-03-29 02:02:56 +01:00
s3c-dma-ops.c	ASoC: Samsung: Do not queue cyclic buffers multiple times	2013-08-29 17:31:02 +01:00
s5p-dev-mfc.c	ARM: SAMSUNG: Remove remaining legacy code	2014-07-19 04:32:18 +09:00
setup-camif.c	ARM: S3C[24|64]xx: move includes back under <mach/> scope	2014-01-14 15:24:06 +01:00
wakeup-mask.c	driver-core: remove sysdev.h usage.	2011-12-21 16:26:03 -08:00
watchdog-reset.c	ARM: SAMSUNG: Add watchdog reset driver	2013-06-19 03:13:16 +09:00