| commit | 4c4a2498319cb4c91083d9c6d7f9372bcce755bc | [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 | 5a6de5cda6923e34a3ebfa5723231e2a4c0172a5 [diff] | |
| parent | 6d615b186b365515b302018c0b7935c360010da8 [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>