Merge branch '2019-05-03-master-imports'
authorTom Rini <trini@konsulko.com>
Fri, 3 May 2019 11:30:55 +0000 (07:30 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 3 May 2019 11:30:55 +0000 (07:30 -0400)
- Various btrfs fixes
- Various TI platform fixes
- Other fixes (cross build, taurus update, Kconfig help text)

1  2 
MAINTAINERS
arch/arm/dts/Makefile
doc/git-mailrc

diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc doc/git-mailrc
Simple merge