From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Feb 2020 19:50:58 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v5.6-rc1~84
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=46d6b7becb1d5a8e697db786590c19e4067a975a;p=users%2Fjedix%2Flinux-maple.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fix from David Miller:
 "adjtimex regression fix from Arnd"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: fix adjtimex regression
---

46d6b7becb1d5a8e697db786590c19e4067a975a