Greg Kroah-Hartman 2d63baf0b5 Merge 5a32c3413d ("Merge tag 'dma-mapping-5.10' of git://git.infradead.org/users/hch/dma-mapping") into android-mainline ... Resolves conflicts in: kernel/dma/mapping.c Steps on the way to 5.10-rc1 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I61292201a3ac4b92c39f330585692652cf985550		2020-10-26 08:06:17 +01:00
..
drm	Merge 5a32c3413d ("Merge tag 'dma-mapping-5.10' of git://git.infradead.org/users/hch/dma-mapping") into android-mainline	2020-10-26 08:06:17 +01:00
host1x	drm next for 5.10-rc1	2020-10-15 10:46:16 -07:00
ipu-v3	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
trace
vga	vgaarb: mark vga_tryget static	2020-08-01 11:28:17 +02:00
Makefile