Files
kernel_arpi/drivers/pwm
Greg Kroah-Hartman b3dde85bf4 Merge e37b12e4bb ("Merge tag 'for-linus-5.11-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux") into android-mainline
Resolves conflicts in:
	arch/arm64/kvm/sys_regs.c

Steps on the way to 5.11-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4dfd38048e8cd9bf876dd4f280533c39b3352f30
2021-01-06 18:34:38 +01:00
..