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)
- Convert DM_MMC and DM_SCSI
- A20, R40, H6 Linux dts(i) sync
- CLK, RESET support for sunxi, sun8_emac net drivers

1  2 
drivers/ata/Kconfig
include/configs/sunxi-common.h
scripts/config_whitelist.txt

Simple merge
Simple merge
Simple merge