summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-mx31lilly.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-10-28 10:11:42 -0700
committerOlof Johansson <olof@lixom.net>2013-10-28 10:11:42 -0700
commit0fc869e8f22bc74a9971f9025f8608d6587c4fb7 (patch)
tree7c0d565e13309f1c3e9931265e8f44b50b53d8a7 /arch/arm/mach-imx/mach-mx31lilly.c
parent4dcf03346af269579fdfdadb662d22035c9fceb6 (diff)
parent64cc69abbb32e17aa44d2c696eca65cb6f9364ca (diff)
downloadtalos-obmc-linux-0fc869e8f22bc74a9971f9025f8608d6587c4fb7.tar.gz
talos-obmc-linux-0fc869e8f22bc74a9971f9025f8608d6587c4fb7.zip
Merge branch 'cleanup/dt-clock' into next/soc
Merging in dt clock cleanup as a pre-req with some of the later SoC branches. There are a handful of conflicts here -- some of the already merged SoC branches should have been based on the cleanup but weren't. In particular, a remove/add of include on highbank and two remove/remove conflicts on kirkwood were fixed up. * cleanup/dt-clock: (28 commits) ARM: vt8500: remove custom .init_time hook ARM: vexpress: remove custom .init_time hook ARM: tegra: remove custom .init_time hook ARM: sunxi: remove custom .init_time hook ARM: sti: remove custom .init_time hook ARM: socfpga: remove custom .init_time hook ARM: rockchip: remove custom .init_time hook ARM: prima2: remove custom .init_time hook ARM: nspire: remove custom .init_time hook ARM: nomadik: remove custom .init_time hook ARM: mxs: remove custom .init_time hook ARM: kirkwood: remove custom .init_time hook ARM: imx: remove custom .init_time hook ARM: highbank: remove custom .init_time hook ARM: exynos: remove custom .init_time hook ARM: dove: remove custom .init_time hook ARM: bcm2835: remove custom .init_time hook ARM: bcm: provide common arch init for DT clocks ARM: call of_clk_init from default time_init handler ARM: vt8500: prepare for arch-wide .init_time callback ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31lilly.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud