]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Thu, 11 Dec 2014 23:40:49 +0000 (18:40 -0500)
committerTom Rini <trini@ti.com>
Thu, 11 Dec 2014 23:40:49 +0000 (18:40 -0500)
Conflicts:
board/freescale/mx6sxsabresd/mx6sxsabresd.c

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

No differences found