Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Aug 2013 15:51:28 +0000 (08:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Aug 2013 15:51:28 +0000 (08:51 -0700)
Pull cgroup fix from Tejun Heo:
 "This contains one patch to fix the return value of cpuset's cgroups
  interface function, which used to always return -ENODEV for the writes
  on the 'memory_pressure_enabled' file"

* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cpuset: fix the return value of cpuset_write_u64()


Trivial merge