Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 30 May 2013 12:45:06 +0000 (14:45 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 30 May 2013 12:45:06 +0000 (14:45 +0200)
commita19b0dd62d7b8efc658fa1aa685ff5665878f3ee
tree1fadf0fb3da83203ba28f209ec99e1b33e03f4d5
parent60985bba58e7695dac1fddae8cdbb62d8cfd1254
parenta71d45d706a5b51c348160163b6c159632273fed
Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
common/cmd_fpga.c
drivers/usb/host/ohci-at91.c
.gitignore
MAINTAINERS
README
board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
boards.cfg
common/Makefile
common/cmd_fpga.c
drivers/mmc/Makefile
drivers/usb/host/ohci-at91.c
include/netdev.h
include/phy.h