mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 06:12:08 +00:00
e17fd8e58a
- 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> |
||
---|---|---|
.. | ||
abort-ev4.S | ||
abort-ev4t.S | ||
abort-ev5t.S | ||
abort-ev5tj.S | ||
abort-ev6.S | ||
abort-ev7.S | ||
abort-lv4t.S | ||
abort-macro.S | ||
abort-nommu.S | ||
alignment.c | ||
cache-aurora-l2.h | ||
cache-fa.S | ||
cache-feroceon-l2.c | ||
cache-l2x0.c | ||
cache-nop.S | ||
cache-tauros2.c | ||
cache-tauros3.h | ||
cache-v4.S | ||
cache-v4wb.S | ||
cache-v4wt.S | ||
cache-v6.S | ||
cache-v7.S | ||
cache-xsc3l2.c | ||
context.c | ||
copypage-fa.c | ||
copypage-feroceon.c | ||
copypage-v4mc.c | ||
copypage-v4wb.c | ||
copypage-v4wt.c | ||
copypage-v6.c | ||
copypage-xsc3.c | ||
copypage-xscale.c | ||
dma-mapping.c | ||
dump.c | ||
extable.c | ||
fault-armv.c | ||
fault.c | ||
fault.h | ||
flush.c | ||
fsr-2level.c | ||
fsr-3level.c | ||
highmem.c | ||
hugetlbpage.c | ||
idmap.c | ||
init.c | ||
iomap.c | ||
ioremap.c | ||
Kconfig | ||
l2c-common.c | ||
l2c-l2x0-resume.S | ||
Makefile | ||
mm.h | ||
mmap.c | ||
mmu.c | ||
nommu.c | ||
pabort-legacy.S | ||
pabort-v6.S | ||
pabort-v7.S | ||
pgd.c | ||
proc-arm7tdmi.S | ||
proc-arm9tdmi.S | ||
proc-arm720.S | ||
proc-arm740.S | ||
proc-arm920.S | ||
proc-arm922.S | ||
proc-arm925.S | ||
proc-arm926.S | ||
proc-arm940.S | ||
proc-arm946.S | ||
proc-arm1020.S | ||
proc-arm1020e.S | ||
proc-arm1022.S | ||
proc-arm1026.S | ||
proc-fa526.S | ||
proc-feroceon.S | ||
proc-macros.S | ||
proc-mohawk.S | ||
proc-sa110.S | ||
proc-sa1100.S | ||
proc-syms.c | ||
proc-v6.S | ||
proc-v7-2level.S | ||
proc-v7-3level.S | ||
proc-v7.S | ||
proc-v7m.S | ||
proc-xsc3.S | ||
proc-xscale.S | ||
tcm.h | ||
tlb-fa.S | ||
tlb-v4.S | ||
tlb-v4wb.S | ||
tlb-v4wbi.S | ||
tlb-v6.S | ||
tlb-v7.S |