| commit | b7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Wed Dec 31 15:10:36 2014 -0500 |
| committer | Tom Rini <trini@ti.com> | Wed Dec 31 15:10:36 2014 -0500 |
| tree | 47dc3ac1f5dbdf54d1f622f5b83d174ff35e0556 | |
| parent | 6d76e2aca82a0da47df80304211203f80b09f082 [diff] | |
| parent | edd88905ae292355991f13fd0d3c7b3368103050 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-usb Conflicts: include/configs/arndale.h Signed-off-by: Tom Rini <trini@ti.com>