Tejun Heo a8fa94e0f2 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
2014-02-10 19:34:30 -05:00
..
2013-09-10 13:03:41 -07:00
2013-03-13 15:21:48 -07:00
2011-03-11 14:25:50 +00:00
2013-07-09 10:33:30 -07:00
2011-10-29 21:20:22 +02:00
2011-03-31 11:26:23 -03:00
2013-02-27 19:10:09 -08:00
2014-01-29 16:22:40 -08:00
2012-10-06 03:04:57 +09:00
2012-10-09 16:22:40 +09:00
2013-06-18 13:48:45 +02:00
2012-07-30 17:25:16 -07:00
2012-01-31 23:19:47 +02:00
2013-04-29 18:28:42 -07:00