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
..
callchain.c	uaccess: add force_uaccess_{begin,end} helpers	2020-08-12 10:57:59 -07:00
core.c	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
hw_breakpoint.c	powerpc/watchpoint: Don't allow concurrent perf and ptrace events	2020-05-19 00:14:45 +10:00
internal.h	perf: Optimize get_recursion_context()	2020-11-09 18:12:34 +01:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
ring_buffer.c	perf: Reduce stack usage of perf_output_begin()	2020-11-09 18:12:33 +01:00
uprobes.c	kernel: delete repeated words in comments	2021-02-26 09:41:03 -08:00