Merge git://git.denx.de/u-boot-marvell

- Misc dts files sync'ed with Linux version (Chris)
- Orion watchdog fix (Chris)
- kwbimage changed to also support Marvell bin_hdr binary (Chris)
- Add DM support to enable CONFIG_BLK for sata_mv (Stefan)
- Enable BLK on multiple platforms (Stefan)
- Misc minor fixes to AXP theadorable board (Stefan)
- Correct logic for DM_SCSI + unconverted drivers check (stefan)
- Misc changes to kirkwood to enable DM_USB here (Chris)
- Change ahci_mvebu to enable usage on A38x (Baruch)
- Update the kirkwood entry in git-mailrc (Baruch)
- Misc minor improvements (turris, documentation) (Baruch)
- Enhance sata_mv to support Kirkwood as well (Michael)
- Add wdt command (Michael)
- Add Marvell integrated CPUs (MSYS) support with DB-XC3-24G4XG
  board support (Chris)

diff --combined arch/arm/dts/Makefile
index 65e0f66c7893f8d91685ac5ce2094f6402f3f827,0bed99b2e2e95570102ffc05d53f77a698c3abbc..93ad6045baabbf2970b4130401500b3b84fa33d9
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -138,7 -138,7 +138,7 @@@ dtb-$(CONFIG_ARCH_MVEBU) +=                        
        armada-388-clearfog.dtb                 \
        armada-388-gp.dtb                       \
        armada-388-helios4.dtb                  \
-       armada-385-amc.dtb                      \
+       armada-385-db-88f6820-amc.dtb           \
        armada-385-turris-omnia.dtb             \
        armada-7040-db.dtb                      \
        armada-7040-db-nand.dtb                 \
@@@ -151,7 -151,8 +151,8 @@@
        armada-xp-theadorable.dtb               \
        armada-38x-controlcenterdc.dtb          \
        armada-385-atl-x530.dtb                 \
-       armada-385-atl-x530DP.dtb
+       armada-385-atl-x530DP.dtb               \
+       armada-xp-db-xc3-24g4xg.dtb
  
  dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \
        uniphier-ld11-global.dtb \
@@@ -251,8 -252,7 +252,8 @@@ dtb-$(CONFIG_AM33XX) += 
        am335x-pdu001.dtb \
        am335x-chiliboard.dtb \
        am335x-sl50.dtb \
 -      am335x-base0033.dtb
 +      am335x-base0033.dtb \
 +      am335x-guardian.dtb
  dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb   \
        am43x-epos-evm.dtb \
        am437x-idk-evm.dtb \

diff --combined board/Marvell/db-xc3-24g4xg/MAINTAINERS
index 0000000000000000000000000000000000000000,94d4a901783bf79f82462160efe268fef472ddc8..2b27e48181b404ef53f9f032de3415d362a331f4
mode 000000,100644..100644
--- /dev/null
--- 2/board/Marvell/db-xc3-24g4xg/MAINTAINERS
+++ b/board/Marvell/db-xc3-24g4xg/MAINTAINERS
@@@ -1,0 -1,7 +1,7 @@@
 -F:    configs/db-xc3-24g4xg-amc_defconfig
+ DB-XC3-24G4XG BOARD
+ M:    Chris Packham <chris.packham@alliedtelesis.co.nz>
+ S:    Maintained
+ F:    board/Marvell/db-xc3-24g4xg/
+ F:    include/configs/db-xc3-24g4xg.h
++F:    configs/db-xc3-24g4xg_defconfig
+ F:    arch/arm/dts/armada-xp-db-xc3-24g4xg.dts