]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Sat, 1 Jun 2013 06:19:45 +0000 (23:19 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 1 Jun 2013 06:20:24 +0000 (23:20 -0700)
commit796ba0d8ae693d3075754f4f274f369d7083492f
tree39da6a422d579bd00aaf7d39ee8928719a493c74
parent4e444a794d76332adbfe14f350a8a77bd75549d1
parented2670b334a1050aa122cd9ca53c7a545642c46b
Merge branch 'next/soc' into for-next

* next/soc:
  arm: kirkwood: convert db-88f6281/db-88f6282 to the Device Tree
  arm: kirkwood: convert QNAP TS219 to use DT for the PCIe interface
  arm: kirkwood: convert ZyXEL NSA310 to use DT for the PCIe interface
  arm: kirkwood: convert MPL CEC4 to use DT for the PCIe interface
  arm: kirkwood: convert Iomega Iconnect to use DT for the PCIe interface
  arm: kirkwood: add SoC-level Device Tree data for PCIe interfaces
  arm: kirkwood: move PCIe window init to legacy driver
  pci: mvebu: enable driver usage on Kirkwood

Signed-off-by: Olof Johansson <olof@lixom.net>
14 files changed:
arch/arm/arm-soc-for-next-contents.txt
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/kirkwood-iconnect.dts
arch/arm/boot/dts/kirkwood-mplcec4.dts
arch/arm/boot/dts/kirkwood-nsa310.dts
arch/arm/boot/dts/kirkwood-ts219-6281.dts
arch/arm/boot/dts/kirkwood-ts219-6282.dts
arch/arm/boot/dts/kirkwood-ts219.dtsi
arch/arm/boot/dts/kirkwood.dtsi
arch/arm/mach-kirkwood/Kconfig
arch/arm/mach-kirkwood/Makefile
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-kirkwood/board-ts219.c
arch/arm/mach-kirkwood/common.h