From: Olof Johansson Date: Fri, 16 Dec 2011 22:51:24 +0000 (-0800) Subject: Merge branch 'imx6/boards' into next/boards X-Git-Tag: firefly_0821_release~3680^2~3792^2~6 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=578bd83d7e2bbf533c6968291abb36850c6eaff8;p=firefly-linux-kernel-4.4.55.git 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 --- 578bd83d7e2bbf533c6968291abb36850c6eaff8