From: Tejun Heo <tj@kernel.org>
Date: Tue, 11 Feb 2014 00:34:30 +0000 (-0500)
Subject: Merge branch 'master' into driver-core-next-test-merge-rc2
X-Git-Tag: v3.15-rc1~140^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8fa94e0f2ab665f9aa665195618178b61ed8304;p=pandora-kernel.git

Merge branch 'master' into driver-core-next-test-merge-rc2

da9846ae1518 ("kernfs: make kernfs_deactivate() honor KERNFS_LOCKDEP
flag") in driver-core-linus conflicts with kernfs_drain() updates in
driver-core-next.  The former just adds the missing KERNFS_LOCKDEP
checks which are already handled by kernfs_lockdep() checks in
driver-core-next.  The conflict can be resolved by taking code from
driver-core-next.

Conflicts:
	fs/kernfs/dir.c
---

a8fa94e0f2ab665f9aa665195618178b61ed8304
Reading git-diff-tree failed