]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Wed, 31 Dec 2014 20:10:36 +0000 (15:10 -0500)
committerTom Rini <trini@ti.com>
Wed, 31 Dec 2014 20:10:36 +0000 (15:10 -0500)
commitb7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331
tree47dc3ac1f5dbdf54d1f622f5b83d174ff35e0556
parent6d76e2aca82a0da47df80304211203f80b09f082
parentedd88905ae292355991f13fd0d3c7b3368103050
Merge branch 'master' of git://git.denx.de/u-boot-usb

Conflicts:
include/configs/arndale.h

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