]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'imx6/boards' into next/boards
authorOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 22:51:24 +0000 (14:51 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 22:51:24 +0000 (14:51 -0800)
* 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


Trivial merge