From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Jan 2020 18:46:43 +0000 (-0800)
Subject: Merge tag 'rtc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
X-Git-Tag: v5.10.7~3542
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b967793c96dde15cbcb07fb98238535682cc27f8;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'rtc-5.5-2' of git://git./linux/kernel/git/abelloni/linux

Pull RTC fixes from Alexandre Belloni:
 "A few fixes for this cycle. The CMOS AltCentury support broke a few
  platforms with a recent BIOS so I reverted it. The mt6397 fix is not
  that critical but good to have. And finally, the sun6i fix repairs
  WiFi and BT on a few platforms.

  Summary:

   - cmos: revert AltCentury support on AMD/Hygon

   - mt6397: fix alarm register overwrite

   - sun6i: ensure clock is working on R40"

* tag 'rtc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  rtc: cmos: Revert "rtc: Fix the AltCentury value on AMD/Hygon platform"
  rtc: mt6397: fix alarm register overwrite
  rtc: sun6i: Add support for RTC clocks on R40
---

b967793c96dde15cbcb07fb98238535682cc27f8