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

..

alpha

alpha: fix broken network checksum

2014-01-31 09:21:55 -08:00

arc

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2014-01-30 16:58:05 -08:00

arm

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

2014-02-02 11:11:06 -08:00

arm64

arm64: defconfig: Expand default enabled features

2014-02-07 17:17:28 +00:00

avr32

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

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

blackfin

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

c6x

lib: Add missing arch generic-y entries for asm-generic/hash.h

2013-12-17 21:26:19 -05:00

cris

Merge tag 'cris-correction-for-3.14' of git://jni.nu/cris

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

frv

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2014-01-30 16:58:05 -08:00

hexagon

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

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

ia64

[IA64] Wire up new sched_setattr and sched_getattr syscalls

2014-01-28 09:52:53 -08:00

m32r

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

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

m68k

Merge branch 'for-3.14/core' of git://git.kernel.dk/linux-block

2014-01-30 11:19:05 -08:00

metag

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

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

microblaze

Merge tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze

2014-01-28 09:04:11 -08:00

mips

MIPS: fpu.h: Fix build when CONFIG_BUG is not set

2014-02-06 13:42:43 +01:00

mn10300

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2014-01-30 16:58:05 -08:00

openrisc

Merge tag 'for-3.14' of git://openrisc.net/~jonas/linux

2014-01-30 17:08:41 -08:00

parisc

execve: use 'struct filename *' for executable name passing

2014-02-05 12:54:53 -08:00

powerpc

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2014-01-31 08:37:32 -08:00

s390

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

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

score

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

sh

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

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

sparc

sparc: Hook up sched_setattr and sched_getattr syscalls.

2014-01-29 00:45:06 -08:00

tile

tile: remove compat_sys_lookup_dcookie declaration to fix compile error

2014-02-01 10:55:15 -08:00

um

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

2014-01-26 11:06:16 -08:00

unicore32

arch/unicore32/kernel/early_printk.c:setup_early_printk: missing initialization

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

x86

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-02-08 11:54:43 -08:00

xtensa

Merge branch 'for-3.14/core' of git://git.kernel.dk/linux-block

2014-01-30 11:19:05 -08:00

.gitignore

…

Kconfig

stackprotector: Introduce CONFIG_CC_STACKPROTECTOR_STRONG

2013-12-20 09:38:40 +01:00