Greg Kroah-Hartman 14f1854cdb Merge fecfd01539 ("Merge tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline ... Steps on the way to 5.12-rc1 Resolves merge conflicts in: drivers/dma-buf/dma-heap.c drivers/dma-buf/heaps/cma_heap.c drivers/dma-buf/heaps/system_heap.c include/linux/dma-heap.h Cc: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ibb32dbdba5183c9e19f5d1e94016cc1ae9616173		2021-03-07 08:45:40 +01:00
..
acpi	IOMMU Updates for Linux v5.12	2021-02-22 10:31:29 -08:00
asm-generic	RISC-V Patches for the 5.12 Merge Window	2021-02-26 10:28:35 -08:00
clocksource
crypto	Keyrings miscellany	2021-02-23 16:09:23 -08:00
drm	Merge fecfd01539 ("Merge tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline	2021-03-07 08:45:40 +01:00
dt-bindings	RISC-V Patches for the 5.12 Merge Window	2021-02-26 10:28:35 -08:00
keys
kunit
kvm
linux	Merge fecfd01539 ("Merge tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline	2021-03-07 08:45:40 +01:00
math-emu
media	Merge 21a6ab2131 ("Merge tag 'modules-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux") into android-mainline	2021-03-06 08:45:21 +01:00
memory
misc
net	Merge fecfd01539 ("Merge tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline	2021-03-07 08:45:40 +01:00
pcmcia
ras
rdma
scsi
soc	RISC-V Patches for the 5.12 Merge Window	2021-02-26 10:28:35 -08:00
sound	Merge d99676af54 ("Merge tag 'drm-next-2021-02-19' of git://anongit.freedesktop.org/drm/drm") into android-mainline	2021-03-03 15:33:39 +01:00
target
trace	Merge fecfd01539 ("Merge tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline	2021-03-07 08:45:40 +01:00
uapi	Merge fecfd01539 ("Merge tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline	2021-03-07 08:45:40 +01:00
vdso
video
xen	xen/events: add per-xenbus device event statistics and settings	2021-02-23 10:07:11 -06:00
OWNERS	ANDROID: add initial set of OWNERS	2021-02-25 13:58:58 +00:00