Greg Kroah-Hartman 0fb885c7b7 ANDROID: fix up rtc-core merge error in previous upstream merge ...

Commit dd5c936967 ("Merge 7e63420847 ("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: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibedf4e800ef54c77da371dea24fede7adc8a4a37

2020-04-09 15:28:26 +02:00

12 KiB

Raw Blame History

View Raw