| commit | 3c49de52d5647cda8b42c4255cf8a29d1e22eff5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 02 18:48:11 2016 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 02 18:48:11 2016 -0800 |
| tree | 51945ac515d7b31c81e79adcd11e78baebeb1daa | |
| parent | 865563924022d8a307ee6dbc6a9ab4fb4d461cce [diff] | |
| parent | bd041733c9f612b66c519e5a8b1a98b05b94ed24 [diff] |
Merge branch 'akpm' (patches from Andrew) Merge more fixes from Andrew Morton: "2 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm, vmscan: add cond_resched() into shrink_node_memcg() mm: workingset: fix NULL ptr in count_shadow_nodes