git.librecmc.org Git - oweals/u-boot.git/commit

Merge branch 'master' of git://git.denx.de/u-boot-usb

Conflicts:
board/freescale/mx6sxsabresd/mx6sxsabresd.c

Signed-off-by: Tom Rini <trini@ti.com>

Unnamed repository; edit this file 'description' to name the repository.

board/freescale/mx6slevk/mx6slevk.c	diff1 \|	diff2 \|	blob \| history
board/freescale/mx6sxsabresd/mx6sxsabresd.c	diff1 \|	diff2 \|	blob \| history
drivers/dfu/dfu.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
include/configs/mx6slevk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx6sxsabresd.h	diff1 \|	diff2 \|	blob \| history
include/usb/ehci-fsl.h	diff1 \|	diff2 \|	blob \| history