| commit | 6ded2450383c5d622d3abb4d2a4d5ce8a0e8c229 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Thu Sep 20 20:15:21 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Thu Sep 20 20:15:21 2012 -0700 |
| tree | 01a59245236ed5fe07a20d2e6c1437d914fbdbae | |
| parent | 7a5551c727563a354f37118ea572304cf584513f [diff] | |
| parent | 7aff3fba8437438a86e6debe2429cd12a69b05d0 [diff] |
Merge tag 'mxs-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt From Shawn Guo: This is the second round of mxs-dt patches for 3.7. It's based on mxs-dt-3.7 and mxs-clk-dt-lookup which have been pulled into arm-soc. * tag 'mxs-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: mxs: m28evk: Disable OCOTP OUI loading ARM: dts: imx23-olinuxino: Add USB host support ARM: dts: mx23: Add USB resources ARM: dts: mxs: Add ethernetX to macX aliases