Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Wed, 17 Apr 2019 13:19:45 +0000 (09:19 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 17 Apr 2019 13:19:45 +0000 (09:19 -0400)
commit4b37f36d68ebb79cdc7d68a539de71e28e954d11
treec982cc1d42e8eeb28dc1dc31d027e1fe145f113d
parent14b8c420b88a90e7ca0c979a2ee413bf459941e8
parentf8c8669760610b2949d8d9ccaeef8231a44d4205
Merge branch 'master' of git://git.denx.de/u-boot-sunxi

- Convert DM_MMC and DM_SCSI
- A20, R40, H6 Linux dts(i) sync
- CLK, RESET support for sunxi, sun8_emac net drivers
drivers/ata/Kconfig
include/configs/sunxi-common.h
scripts/config_whitelist.txt