Merge tag 'atlas7-init-dts-for-3.20' of...
Merge tag 'atlas7-init-dts-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/dt Merge "CSR atlas7 init dts for 3.20" from Barry Song: Drop Marco and add init dts stuff for Atlas7 CSR Marco SoC has never shipped to customers that could be interested in mainline support. and new Atlas7 is a replacement SoC that is in development. So we drop Marco dts stuff, and add dts stuff for Atlas7. * tag 'atlas7-init-dts-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux: ARM: dts: add init dts file for CSR atlas7 SoC ARM: dts: drop MARCO platform DT stuff Signed-off-by: NOlof Johansson <olof@lixom.net>
Showing
arch/arm/boot/dts/atlas7-evb.dts
0 → 100644
arch/arm/boot/dts/atlas7.dtsi
0 → 100644
arch/arm/boot/dts/marco.dtsi
已删除
100644 → 0
想要评论请 注册 或 登录