Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Dec 2016 02:48:11 +0000 (18:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Dec 2016 02:48:11 +0000 (18:48 -0800)
commit3c49de52d5647cda8b42c4255cf8a29d1e22eff5
tree51945ac515d7b31c81e79adcd11e78baebeb1daa
parent865563924022d8a307ee6dbc6a9ab4fb4d461cce
parentbd041733c9f612b66c519e5a8b1a98b05b94ed24
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