diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-10 09:51:26 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-10 09:51:26 -0800 |
commit | f7c8faedf98aa5ec372e0191078ac7fe1e7fb067 (patch) | |
tree | 14e69d0e6022e23850611abdc1b48770b921c193 /arch/sh/kernel/machine_kexec.c | |
parent | acf346084bca289a00020a5c29c23673b801b380 (diff) | |
parent | 4d2e4d7f2c2b1a4382286821a59fa2f4012cb748 (diff) | |
download | linux-f7c8faedf98aa5ec372e0191078ac7fe1e7fb067.tar.gz linux-f7c8faedf98aa5ec372e0191078ac7fe1e7fb067.tar.bz2 linux-f7c8faedf98aa5ec372e0191078ac7fe1e7fb067.zip |
Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
* 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: fix cycle count for periodic mode of clock event timers
ARM: EXYNOS: add support JPEG
ARM: EXYNOS: Add DMC1, allow PPMU access for DMC
ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition
ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()
ARM: SAMSUNG: Add __init attribute to samsung_bl_set()
ARM: S5PV210: Add usb otg phy control
ARM: S3C64XX: Add usb otg phy control
ARM: EXYNOS: Enable l2 configuration through device tree
ARM: EXYNOS: remove useless code to save/restore L2
ARM: EXYNOS: save L2 settings during bootup
ARM: S5P: add L2 early resume code
ARM: EXYNOS: Add support AFTR mode on EXYNOS4210
ARM: SAMSUNG: use spin_lock_irqsave() in clk_{enable,disable}
ARM: S3C64XX: Define some additional always off clocks
ARM: S3C64XX: Reduce residency requirement for cpuidle WFI mode
ARM: SAMSUNG: Add a callback 'notify_after' for PWM backlight control
ARM: SAMSUNG: add G2D to plat-s5p and mach-exynos
ARM: S3C64XX: Gate some more clocks by default
ARM: S3C64XX: Add basic cpuidle driver
Diffstat (limited to 'arch/sh/kernel/machine_kexec.c')
0 files changed, 0 insertions, 0 deletions