diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-02 10:52:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-02 10:52:26 -0400 |
| commit | ec7483e34ea932fb68267dc0b1de30be51f271c9 (patch) | |
| tree | 6120e2d0923962ec16cc757a22454bc942c90af4 /include/configs/shmin.h | |
| parent | 07d778382200a05a8b86cc135f79ec48e386f25a (diff) | |
| parent | ec85721c8b94f9eb6807ebb15a223e4ec49a092a (diff) | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/ls1046aqds.h
include/configs/ls1046ardb.h
Diffstat (limited to 'include/configs/shmin.h')
0 files changed, 0 insertions, 0 deletions