summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-02-06 01:05:12 -0800
committerOlof Johansson <olof@lixom.net>2015-02-06 01:05:12 -0800
commit880c0d140deb12d5be39a96375fcc42ad357f17d (patch)
tree4c7b826bb18bdc5e1516048dac98c0a6347f7fbb /arch/ia64/include/asm
parentf5ebaf2687ccd11663ca08c3dd6d4619e12d7dc4 (diff)
parent7808cae3e97140781eb3f712084caf4e44c126c9 (diff)
downloadtalos-obmc-linux-880c0d140deb12d5be39a96375fcc42ad357f17d.tar.gz
talos-obmc-linux-880c0d140deb12d5be39a96375fcc42ad357f17d.zip
Merge tag 'samsung-dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
Merge "Samsung 4th DT updates for v3.20" from Kukjin Kim: - For exynos4 SoCs : add PPMU node : add syscon phandle for video-phy node - For exynos4415 SoC : add mipi dsi and fimd device nodes - For exynos3250-monk and exynos3250-rinato boards : add PPMU node - For exynos4412-trats2 board : add maxim77693 fuel gauge and battery charger nodes : fix regarding CLK_MOUT_CAMn parent and CLK_UART_ISP_SCLK clocks : switch max77686 regulators to GPIO control : add suspend configuration for max77686 regulators : add PPMU node and sound nodes * tag 'samsung-dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Add PPMU node for exynos4412-trats2 ARM: dts: Add PPMU node for exynos3250-monk and exynos3250-rinato ARM: dts: Add PPMU dt node for exynos4 and exynos4210 ARM: dts: Add PPMU dt node for exynos3250 ARM: dts: add mipi dsi device node for exynos4415 ARM: dts: add fimd device node for exynos4415 ARM: dts: Add syscon phandle to the video-phy node for Exynos4 ARM: dts: Add sound nodes for exynos4412-trats2 ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for exynos4412-trats2 ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsi ARM: dts: Add max77693 charger node for exynos4412-trats2 ARM: dts: Switch max77686 regulators to GPIO control for exynos4412-trats2 ARM: dts: Add suspend configuration for max77686 regulators for exynos4412-trats2 ARM: dts: Add Maxim 77693 fuel gauge node for exynos4412-trats2 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/ia64/include/asm')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud