Commit 0fb885c7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ANDROID: fix up rtc-core merge error in previous upstream merge

Commit dd5c9369 ("Merge 7e634208 ("Merge tag 'acpi-5.7-rc1-2' of
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm"

) into
android-mainline") was not done properly, and had a half-completed merge
of drivers/rtc/class.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibedf4e800ef54c77da371dea24fede7adc8a4a37
parent 0066ae3a
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment