summaryrefslogtreecommitdiff
path: root/drivers/usb/musb/davinci.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-26 11:22:29 -0500
committerTom Rini <trini@ti.com>2014-11-26 11:22:29 -0500
commit21008ad6384170767041f1608975473c5ffa7fc7 (patch)
treeeb00c0fb9650e14ba768d720c057373d9ea59451 /drivers/usb/musb/davinci.c
parentd3e488eaf48c49980adb8509a76f8577b1cf2599 (diff)
parent3b4b9a3377d6e7cba6060497b02644f9ff2ac67a (diff)
downloadu-boot-imx-21008ad6384170767041f1608975473c5ffa7fc7.zip
u-boot-imx-21008ad6384170767041f1608975473c5ffa7fc7.tar.gz
u-boot-imx-21008ad6384170767041f1608975473c5ffa7fc7.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Conflicts: drivers/mmc/fsl_esdhc.c Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers/usb/musb/davinci.c')
0 files changed, 0 insertions, 0 deletions