Files
kernel_arpi/include/trace
Greg Kroah-Hartman 22a7eefbeb Merge 55e0500eb5 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline
Steps on the way to 5.10-rc1

Fixes merge issues in:
	drivers/scsi/ufs/ufs-qcom.c
	drivers/scsi/ufs/ufshcd.c
	drivers/scsi/ufs/ufshcd.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I69dcb6886b123c75dddf0781fe7bc04db7004032
2020-10-25 16:58:34 +01:00
..