Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
	common/cmd_fpga.c
	drivers/usb/host/ohci-at91.c

diff --cc .gitignore
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc README
Simple merge

diff --cc board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc common/Makefile
Simple merge

diff --cc common/cmd_fpga.c
Simple merge

diff --cc drivers/mmc/Makefile
Simple merge

diff --cc drivers/usb/host/ohci-at91.c
index 086cd0fe5dcd39fc817783094866b597d1488770,aa5cf57aedaad332854c6083fa66b80398f429a9..2060a3eb4612b34849a5341f429a0a7325174f99
--- 1/drivers/usb/host/ohci-at91.c
--- 2/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@@ -54,13 -54,8 +54,13 @@@ int usb_cpu_init(void
  #endif
  
        /* Enable USB host clock. */
 +#ifdef CONFIG_SAMA5D3
 +      writel(1 << (ATMEL_ID_UHP - 32), &pmc->pcer1);
 +#else
        writel(1 << ATMEL_ID_UHP, &pmc->pcer);
- #ifdef CONFIG_AT91SAM9261
 +#endif
 +
+ #if defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10)
        writel(ATMEL_PMC_UHP | AT91_PMC_HCK0, &pmc->scer);
  #else
        writel(ATMEL_PMC_UHP, &pmc->scer);
@@@ -74,13 -69,8 +74,13 @@@ int usb_cpu_stop(void
        at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
  
        /* Disable USB host clock. */
 +#ifdef CONFIG_SAMA5D3
 +      writel(1 << (ATMEL_ID_UHP - 32), &pmc->pcdr1);
 +#else
        writel(1 << ATMEL_ID_UHP, &pmc->pcdr);
- #ifdef CONFIG_AT91SAM9261
 +#endif
 +
+ #if defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10)
        writel(ATMEL_PMC_UHP | AT91_PMC_HCK0, &pmc->scdr);
  #else
        writel(ATMEL_PMC_UHP, &pmc->scdr);

diff --cc include/netdev.h
Simple merge

diff --cc include/phy.h
Simple merge