From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Aug 2015 23:15:26 +0000 (-0700)
Subject: Merge branch 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: firefly_0821_release~176^2~1263
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e9ab22d292aa168ed8d4cb45353a626a3d6f1522;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-4.2-fixes' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup fix from Tejun Heo:
 "A fix for a subtle bug introduced back during 3.17 cycle which
  interferes with setting configurations under specific conditions"

* 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cpuset: use trialcs->mems_allowed as a temp variable
---

e9ab22d292aa168ed8d4cb45353a626a3d6f1522