diff options
| author | Tom Rini <trini@ti.com> | 2014-11-24 17:01:48 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-24 17:01:48 (GMT) |
| commit | 1739564e753bc3a8097f8937a3cbe738bdaaed5d (patch) | |
| tree | 56fe759e62f129dc055b6f6a22f299f6c8b5cdde /arch/arm/cpu/armv7 | |
| parent | 746667f1e56bf08d03e66a178df3c4f4f6c806e1 (diff) | |
| parent | 17b28edb37a33d0c89089faf36e4edd7084f65fa (diff) | |
| download | u-boot-fsl-qoriq-1739564e753bc3a8097f8937a3cbe738bdaaed5d.tar.xz | |
Merge git://git.denx.de/u-boot-dm
Conflicts:
drivers/serial/serial-uclass.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7')
0 files changed, 0 insertions, 0 deletions