diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 18:24:20 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 18:24:59 (GMT) |
| commit | 1f1ba836455b94494aaee9381ed9197ade2f770f (patch) | |
| tree | c66d7d1084245b3e8c2eb36c9ec5289dd842adc2 /arch/arm/kernel/sleep.S | |
| parent | 97b129be91bc978a205db24241840b95cfa28325 (diff) | |
| parent | b8edec0f4e5e1452c2a3ff8cd0de64967ab1b2ae (diff) | |
| download | linux-fsl-qoriq-1f1ba836455b94494aaee9381ed9197ade2f770f.tar.xz | |
Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc2
From Kukjin Kim:
This includes supporting legacy i2c controller and ARM down clock
support for exynos5 and small changes.
[olof: It contains a dependency on samsung/hdmi for HDMI DT bindings, for some reason.]
* 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Clock settings for SATA and SATA PHY
ARM: EXYNOS: Add ARM down clock support
ARM: EXYNOS: Fix i2c suspend/resume for legacy controller
ARM: EXYNOS: Add aliases for i2c controller
ARM: EXYNOS: Setup legacy i2c controller interrupts
ARM: EXYNOS: removing exynos-drm device registration from non-dt platforms
ARM: EXYNOS: add clocks for exynos5 hdmi
ARM: dts: add device tree support for exynos5 hdmiddc
ARM: dts: add device tree support for exynos5 hdmiphy
ARM: dts: add device tree support for exynos5 mixer
ARM: dts: add device tree support for exynos5 hdmi
ARM: EXYNOS: Add dp clock support for EXYNOS5
ARM: SAMSUNG: call clk_get_rate for debugfs rate files
ARM: SAMSUNG: add clock_tree debugfs file in clock
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/kernel/sleep.S')
0 files changed, 0 insertions, 0 deletions