diff options
author | Tom Rini <trini@konsulko.com> | 2016-10-28 18:12:03 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-10-28 18:12:03 +0300 |
commit | 4f892924d238cc415891dbea336a0fdaff2f853b (patch) | |
tree | 145882227f01a5092c656d1fc7122adff76bc8c2 /.travis.yml | |
parent | ec1eaad06551e2422baf8743f6987d4f561f2ce6 (diff) | |
parent | 1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f (diff) | |
download | u-boot-4f892924d238cc415891dbea336a0fdaff2f853b.tar.xz |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
common/Kconfig
configs/dms-ba16_defconfig
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions