diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-16 14:51:24 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-16 14:51:24 -0800 |
commit | 578bd83d7e2bbf533c6968291abb36850c6eaff8 (patch) | |
tree | ed9643d02f34d28036f4fc07d2211ad0b91219cb /arch/arm/mach-zynq | |
parent | 58c017750dc00793cf9ee292a5ce4df1748e852f (diff) | |
parent | 1bccc8077f4ddbd64d7d085501baa2543182f29e (diff) | |
download | blackbird-op-linux-578bd83d7e2bbf533c6968291abb36850c6eaff8.tar.gz blackbird-op-linux-578bd83d7e2bbf533c6968291abb36850c6eaff8.zip |
Merge branch 'imx6/boards' into next/boards
* imx6/boards:
ARM: imx6q: generate imx6q dtb files
arm/imx6q: Rename Sabreauto to Armadillo2
arm/imx6q-sabrelite: add enet phy ksz9021rn fixup
arm/imx6: add imx6q sabrelite board support
dts/imx: rename uart labels to consistent with hw spec
dts/imx: rename gpio labels to consistent with hw spec
Diffstat (limited to 'arch/arm/mach-zynq')
0 files changed, 0 insertions, 0 deletions