diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-27 08:22:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-27 08:22:59 -0800 |
| commit | ff17bf8a0d2d60a343db304b835c0e83efa660d9 (patch) | |
| tree | 7781eb9ef0c122bd548149695f7d2b20751ce0b0 /include/linux/timerqueue.h | |
| parent | d8e435f3ab6fea2ea324dce72b51dd7761747523 (diff) | |
| parent | 2a872a5dcec7052e9fd948ee77a62187791735ff (diff) | |
| download | linux-ff17bf8a0d2d60a343db304b835c0e83efa660d9.tar.gz linux-ff17bf8a0d2d60a343db304b835c0e83efa660d9.tar.bz2 linux-ff17bf8a0d2d60a343db304b835c0e83efa660d9.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/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
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions