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)
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


Trivial merge