tree ed9643d02f34d28036f4fc07d2211ad0b91219cb
parent 58c017750dc00793cf9ee292a5ce4df1748e852f
parent 1bccc8077f4ddbd64d7d085501baa2543182f29e
author Olof Johansson <olof@lixom.net> 1324075884 -0800
committer Olof Johansson <olof@lixom.net> 1324075884 -0800

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