summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/versatile-ab.dts
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2014-08-11 15:06:23 +0200
committerGrant Likely <grant.likely@linaro.org>2014-08-11 15:06:23 +0200
commit663d3f7c2e5e1b018a4c53277ccfde40329d98ca (patch)
treea3afcc2d8fe682bdcc4c2e39b47ab3987b38c69a /arch/arm/boot/dts/versatile-ab.dts
parentMerge branch 'devicetree/next-console' into devicetree/next (diff)
parentof: typo fix in __of_prop_dup() (diff)
downloadlinux-663d3f7c2e5e1b018a4c53277ccfde40329d98ca.tar.xz
linux-663d3f7c2e5e1b018a4c53277ccfde40329d98ca.zip
Merge branch 'devicetree/next-overlay' into devicetree/next
Conflicts: drivers/of/testcase-data/testcases.dts
Diffstat (limited to 'arch/arm/boot/dts/versatile-ab.dts')
0 files changed, 0 insertions, 0 deletions