From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Jun 2013 08:57:16 +0000 (+0900)
Subject: Merge branch 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7d80fea4263d9a83ffedea448afa8510b05d04d0;p=openwrt%2Fstaging%2Fblogic.git

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

Pull cgroup fixes from Tejun Heo:

 - Fix for yet another xattr bug which may lead to NULL deref.

 - A subtle bug in for_each_descendant_pre().  This bug requires quite
   specific conditions to trigger and isn't too likely to actually
   happen in the wild, but maybe that just makes it that much more
   nastier.

 - A warning message added for silly cgroup re-mount (not -o remount,
   but unmount followed by mount) behavior.

* 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: warn about mismatching options of a new mount of an existing hierarchy
  cgroup: fix a subtle bug in descendant pre-order walk
  cgroup: initialize xattr before calling d_instantiate()
---

7d80fea4263d9a83ffedea448afa8510b05d04d0