tree edd7450cf80800d07add27f364cc8b52f60fc776
parent 7e60784b29452815ca7560d865676fd9c8c9f9d6
parent 548ce227d3d852455c6395c0cec30af0cda77b09
author Praneeth Bajjuri <praneeth@ti.com> 1582777203 -0600
committer Alistair Delva <adelva@google.com> 1582935395 -0800

Merge branch 'upstream-master'

* upstream-master: (1320 commits)
  Prepare v2020.04-rc3
  board: novtech: meerkat96: use correct mmc driver
  moveconfig: convert ps.stderr to string
  moveconfig: replace unsafe eval with asteval
  MAINTAINERS: set maintainer for doc/api/efi.rst
  arch: arm: Fix SZ_64K undeclared compilation error
  tools: image-host.c: remove uboot_aes.h
  doc/Makefile: turn warnings into errors
  azure: build HTML documentation
  gitlab: build HTML documentation
  travis: build HTML docs
  travis: Add python3-sphinx to the package list
  arch: powerpc: Rewrite the sata node to fit the driver
  Revert "configs: enable sata device module in T2080QDS"
  Revert "powerpc: mpc85xx: delete FSL_SATA for T2080QDS board."
  Revert "ata: fsl_ahci: Add sata DM support for Freescale powerpc socs"
  doc: update doc/sphinx/kerneldoc.py
  Azure / GitLab: Update Docker image
  mmc: sdhci: fix missing cache invalidation after reading by DMA
  mmc: sdhci: use dma_map_single() instead of flush_cache() before DMA
  ...

Change-Id: I8bc5ab024b4fe34f01dcc5d5afe2c5e0b787d5c6
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>