Merge branch 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Aug 2015 23:15:26 +0000 (16:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Aug 2015 23:15:26 +0000 (16:15 -0700)
commite9ab22d292aa168ed8d4cb45353a626a3d6f1522
tree6c4b46d8da56ac9010c2723090f049723cd9f0b0
parenta36304b9e154ccaff67b1d1d0ece6ad6380e3648
parent24ee3cf89bef04e8bc23788aca4e029a3f0f06d9
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