git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: d8e435f 2a872a5)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Nov 2016 16:22:59 +0000 (08:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Nov 2016 16:22:59 +0000 (08:22 -0800)
Pull MIPS fixes from Ralf Baechle:
 "Another round of MIPS fixes for 4.9:

   - Fix unreadable output in __do_page_fault due to the KERN_CONT
     patchset

   - Correctly handle MIPS R6 fixes to the c0_wired register"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: mm: Fix output of __do_page_fault
  MIPS: Mask out limit field when calculating wired entry count


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.