From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 11 Dec 2016 18:17:39 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v4.9~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e4333c14de06a333783d6812cf3c4998f78b0c8;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

Pull MIPS fixes from Ralf Baechle:
 "Two more MIPS fixes for 4.9:

   - RTC: Return -ENODEV so an external RTC will be tried

   - Fix mask of GPE frequency

  These two have been tested on Imagination's automated test system and
  also both received positive reviews on the linux-mips mailing list"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Lantiq: Fix mask of GPE frequency
  MIPS: Return -ENODEV from weak implementation of rtc_mips_set_time
---

2e4333c14de06a333783d6812cf3c4998f78b0c8