Merge branch 'mvebu/boards' into for-next

diff --cc arch/arm/mach-kirkwood/board-dt.c
Simple merge

diff --cc arch/arm/mach-kirkwood/board-ts219.c
index 4695d5f35fc937dc6eab658fc979d5ee2ecef721,10fb3974de5a4dcaa1001701f1cdfff45b7edd3f..860f44ab457d4f5b1857028da93bf58c56fd2f05
--- 1/arch/arm/mach-kirkwood/board-ts219.c
--- 2/arch/arm/mach-kirkwood/board-ts219.c
+++ b/arch/arm/mach-kirkwood/board-ts219.c
@@@ -38,6 -37,14 +37,4 @@@ void __init qnap_dt_ts219_init(void
                qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
  
        kirkwood_ge00_init(&qnap_ts219_ge00_data);
- 
-       pm_power_off = qnap_tsx1x_power_off;
  }
 -
 -/* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */
 -static int __init ts219_pci_init(void)
 -{
 -      if (machine_is_ts219())
 -              kirkwood_pcie_init(KW_PCIE0);
 -
 -      return 0;
 -}
 -subsys_initcall(ts219_pci_init);

diff --cc arch/arm/mach-kirkwood/common.h
Simple merge