Commit 059dc61b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 8379d0cb ("mmc: core: Add SD card quirk for broken poweroff...


Merge 8379d0cb ("mmc: core: Add SD card quirk for broken poweroff notification") into android14-6.1-lts

Steps on the way to 6.1.121

Resolved merge conflicts in:
	drivers/mmc/core/card.h
	include/linux/mmc/card.h

Change-Id: I0f59989030d630651cfd6bc28c45db5f313db1fe
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 84fa5db7 8379d0cb
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment