]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu into next/soc
authorArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 09:53:49 +0000 (10:53 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 09:53:49 +0000 (10:53 +0100)
Merge "mvebu soc changes for v3.15 (incremental #3)" from Jason Cooper:

 - dove
    - move devicetree code from mach-dove/ to mach-mvebu/ :-)

* tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: move DT Dove to MVEBU

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/boot/dts/Makefile
arch/arm/mach-mvebu/Kconfig

Simple merge
Simple merge