aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx53.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-26 01:27:27 -0800
committerOlof Johansson <olof@lixom.net>2012-11-26 01:27:31 -0800
commit61da823ab9f1e554da58f1c9f75931829582ad4f (patch)
treebb55b966f3da3de6ff0ccad70fca3dc16c35786d /arch/arm/boot/dts/imx53.dtsi
parent0dfeada90989833d0144b4df25d2b9ce3746624f (diff)
parent52cfa7e54b480661e20dfd8788a24cfcba8a0ca5 (diff)
downloadvexpress-lsk-61da823ab9f1e554da58f1c9f75931829582ad4f.tar.gz
Merge branch 'orion/dt' into next/dt
Merge in orion's cleanup branch together with the DT contents. Ideally the cleanup branch should have been the base for the DT branch to avoid these, but that was missed when first merging. So we're doing it now to reduce the amount of silly conflicts due to internal tree organization. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/imx53.dtsi')
0 files changed, 0 insertions, 0 deletions