tree 368428514d70f34f2261c7f954f241f886d6bb51
parent 045169816b31b10faed984b01c390db1b32ee4c1
parent ba735155b9647b6167fd50276ca0fbfbce4e836c
author Linus Torvalds <torvalds@linux-foundation.org> 1481480259 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1481480259 -0800

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/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