linux/arch/arm/mach-exynos
Arnd Bergmann 944483d033 Merge branch 'next/fixes-non-critical' into next/soc
This resolves a nontrivial conflict against a bug fix
in another branch.

Conflicts:
	arch/arm/mach-exynos/pm.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26 17:54:21 +02:00
..
include/mach ARM: EXYNOS: Refactored code for using PMU address via DT 2014-07-23 08:20:30 +09: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 ARM: EXYNOS: Move cpufreq and cpuidle device registration to init_machine 2014-07-23 08:20:38 +09: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 Merge branch 'v3.17-next/cleanup-samsung' into v3.17-next/power-exynos 2014-07-23 08:18:08 +09:00
Kconfig ARM: use menuconfig for sub-arch menus 2014-06-17 17:09:48 +02:00
Makefile ARM: SoC driver changes 2014-06-02 16:35:49 -07: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: EXYNOS: Refactored code for using PMU address via DT 2014-07-23 08:20:30 +09:00
mfc.h ARM: SAMSUNG: Reorganize calls to reserve memory for MFC 2014-03-21 02:00:09 +09:00
platsmp.c Merge branch 'next/fixes-non-critical' into next/soc 2014-07-26 17:54:21 +02:00
pm_domains.c ARM: EXYNOS: Remove regs-pmu.h header dependency from pm_domain 2014-07-15 08:40:32 +09:00
pm.c Merge branch 'next/fixes-non-critical' into next/soc 2014-07-26 17:54:21 +02: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