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

..

acpi

Merge branches 'acpi-processor', 'acpi-hotplug', 'acpi-init', 'acpi-pm' and 'acpica'

2014-01-29 11:47:18 +01:00

asm-generic

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2014-01-27 21:03:39 -08:00

clocksource

…

crypto

…

drm

Merge tag 'drm/for-3.14-rc1-20140123' of git://anongit.freedesktop.org/tegra/linux into drm-next

2014-01-29 12:03:56 +10:00

dt-bindings

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2014-01-30 17:07:18 -08:00

keys

…

kvm

…

linux

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

2014-02-10 19:34:30 -05:00

math-emu

…

media

…

memory

…

misc

…

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2014-01-25 11:17:34 -08:00

pcmcia

…

ras

…

rdma

…

rxrpc

…

scsi

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2014-01-31 15:31:23 -08:00

sound

Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-01-23 18:48:28 -08:00

target

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2014-01-31 15:31:23 -08:00

trace

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2014-01-31 09:31:14 -08:00

uapi

Merge git://git.infradead.org/users/willy/linux-nvme

2014-02-05 15:53:26 -08:00

video

…

xen

Merge tag 'stable/for-linus-3.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2014-02-05 16:01:11 -08:00

Kbuild

…