Files
kernel/include/linux
Tejun Heo a8fa94e0f2 Merge branch 'master' into driver-core-next-test-merge-rc2
da9846ae15 ("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
..
2014-01-20 11:55:23 -08:00
2014-01-24 22:39:54 +01:00
2014-01-17 01:59:38 +01:00
2014-01-14 14:54:00 -05:00
2014-01-28 08:09:46 -07:00
2014-01-16 10:23:02 +10:30
2014-01-16 11:15:50 +01:00
2014-01-26 22:48:35 +01:00
2014-02-07 16:08:57 -08:00
2014-01-25 08:55:09 +01:00
2014-01-08 19:03:00 -02:00
2014-01-16 10:23:03 +10:30
2014-01-27 21:02:39 -08:00
2014-01-22 21:57:17 -08:00
2014-01-25 03:14:05 -05:00
2014-01-27 19:27:53 -05:00
2014-01-13 14:29:49 -08:00
2014-01-03 11:22:21 -08:00
2014-01-22 19:36:57 +01:00
2014-01-28 13:20:09 -08:00
2014-01-27 21:02:39 -08:00
2014-01-30 16:56:55 -08:00