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

..

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

drm/tegra: Changes for v3.14-rc1 (update)

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

KVM: arm-vgic: Set base addr through device API

2013-12-21 10:01:22 -08:00

linux

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

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

math-emu

math-emu: fix floating-point to integer overflow detection

2014-01-07 18:36:24 -06:00

media

[media] saa6588: add support for non-blocking mode

2014-01-07 07:42:19 -02:00

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

Merge branch 'ip-roce' into for-next

2014-01-22 23:24:21 -08:00

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

ARM: SoC board updates for 3.14

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

video: pxa168fb: Cleanup pxa168fb.h file

2014-01-17 10:57:43 +02:00

xen

Bug-fixes:

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

Kbuild

…