Files
kernel_arpi/kernel/trace
Greg Kroah-Hartman 368ecbcb2f Merge 21a6ab2131 ("Merge tag 'modules-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux") into android-mainline
Steps on the way to 5.12-rc1

Resolves conflicts in:
	include/linux/module.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I44772d65a5d6b1c5f4c33905554092c2cdc5b210
2021-03-06 08:45:21 +01:00
..