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
..
calibrate.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
do_mounts_initrd.c	Merge branch 'hch.init_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2020-08-07 09:40:34 -07:00
do_mounts_rd.c	init: add an init_unlink helper	2020-07-31 08:17:52 +02:00
do_mounts.c	block: merge struct block_device and struct hd_struct	2020-12-01 14:53:40 -07:00
do_mounts.h	init: add an init_mknod helper	2020-07-31 08:17:54 +02:00
init_task.c	fgraph: Initialize tracing_graph_pause at task creation	2021-01-29 15:07:32 -05:00
initramfs.c	RISC-V Patches for the 5.12 Merge Window	2021-02-26 10:28:35 -08:00
Kconfig	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
Kconfig.gki	ANDROID: GKI: Kconfig.gki: add hidden PHY configs	2021-02-04 15:22:14 -08:00
main.c	kgdb: fix to kill breakpoints on initmem after boot	2021-02-26 09:41:05 -08:00
Makefile	md: move the early init autodetect code to drivers/md/	2020-07-16 15:34:47 +02:00
noinitramfs.c	init: add an init_mknod helper	2020-07-31 08:17:54 +02:00
version.c	init/version.c: remove Version_<LINUX_VERSION_CODE> symbol	2021-02-26 09:41:04 -08:00