projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitff17bf8a0d2d60a343db304b835c0e83efa660d9
tree7781eb9ef0c122bd548149695f7d2b20751ce0b0tree | snapshot (tar.gz zip)
parentd8e435f3ab6fea2ea324dce72b51dd7761747523commit | diff
parent2a872a5dcec7052e9fd948ee77a62187791735ffcommit | diff
Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

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