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)
commit50e37ccea06ca8846ceb60dbfbe056012c60d71b
treeb64788e97e2bfbaaf8c274ca4cd9da95314f275a
parenta08797e853e27fedb2468d4fd45459fd62902143
parenta903f0865a190f8778c73df1a810ea6e25e5d7cf
Merge branch 'for-3.11-fixes' of git://git./linux/kernel/git/tj/cgroup

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