Greg Kroah-Hartman a64320f5b8 Merge 94709049fb ("Merge branch 'akpm' (patches from Andrew)") into android-mainline ... Tiny merge resolutions along the way to 5.8-rc1. Change-Id: I24b3cca28ed36f32c92b6374dae5d7f006d3bced Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>		2020-06-12 14:39:46 +02:00
..
coherent.c	dma-coherent: fix integer overflow in the reserved-memory dma allocation	2020-03-16 10:43:02 +01:00
contiguous.c	dma-contiguous: CMA: give precedence to cmdline	2020-01-30 14:41:42 +01:00
debug.c	dma-debug: fix displaying of dma allocation type	2020-04-08 21:46:57 +02:00
direct.c	Merge b032227c62 ("Merge tag 'nios2-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2") into android-mainline	2020-04-12 12:31:00 +02:00
dummy.c	dma-mapping: factor out dummy DMA ops	2018-12-13 21:06:12 +01:00
Kconfig	dma-direct: provide mmap and get_sgtable method overrides	2019-11-11 10:52:15 +01:00
Makefile	dma-mapping: improve selection of dma_declare_coherent availability	2019-02-20 07:26:35 -07:00
mapping.c	Merge 1a323ea535 ("x86: get rid of 'errret' argument to __get_user_xyz() macross") into android-mainline	2020-04-04 12:17:50 +02:00
remap.c	dma-mapping: use vmap insted of reimplementing it	2020-06-02 10:59:10 -07:00
swiotlb.c	dma-direct: improve swiotlb error reporting	2020-02-05 18:53:05 +01:00
virt.c	dma-mapping: zero memory returned from dma_alloc_*	2018-12-20 08:13:52 +01:00