diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-20 15:31:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-20 15:31:08 -0700 |
commit | c154165e93b7f1ee9c63906fa200bc735098d47d (patch) | |
tree | 3903e3f67807b2b9a08fdd3dd4d2636c0ad974a3 /drivers/input/joystick/spaceorb.c | |
parent | 160062e19001b224370cddeaf652f258fd916fb0 (diff) | |
parent | fc280fe871449ead4bdbd1665fa52c7c01c64765 (diff) | |
download | op-kernel-dev-c154165e93b7f1ee9c63906fa200bc735098d47d.zip op-kernel-dev-c154165e93b7f1ee9c63906fa200bc735098d47d.tar.gz |
Merge branch 'akpm' (patches from Andrew)
Merge two mm fixes from Andrew Morton.
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: prevent NR_ISOLATE_* stats from going negative
Revert "mm, page_alloc: only use per-cpu allocator for irq-safe requests"
Diffstat (limited to 'drivers/input/joystick/spaceorb.c')
0 files changed, 0 insertions, 0 deletions