From: Tom Rini <trini@konsulko.com>
Date: Wed, 16 Oct 2019 22:10:01 +0000 (-0400)
Subject: Merge branch '2019-10-15-master-imports'
X-Git-Tag: v2020.01-rc1~21
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d2a93a88631929169d3ef1c537430330404f96f7;p=oweals%2Fu-boot.git

Merge branch '2019-10-15-master-imports'

- Split travis jobs again so we don't have failures due to excessive
  build times.
- Android image updates
- cscope bugfix, update ARM maintainers entry, drop H2200 platform.
---

d2a93a88631929169d3ef1c537430330404f96f7