From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Dec 2016 02:48:11 +0000 (-0800)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: microblaze-4.13-rc1~1185
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=3c49de52d5647cda8b42c4255cf8a29d1e22eff5;p=linux-2.6-microblaze.git

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

3c49de52d5647cda8b42c4255cf8a29d1e22eff5