David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-12-18 16:42:06 -05:00

..

alpha

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

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

arc

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

2013-12-18 16:42:06 -05:00

arm

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

2013-12-18 16:42:06 -05:00

arm64

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

2013-12-18 16:42:06 -05:00

avr32

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

2013-12-18 16:42:06 -05:00

blackfin

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

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

c6x

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

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

cris

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

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

frv

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

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

hexagon

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

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

ia64

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

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

m32r

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

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

m68k

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

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

metag

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

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

microblaze

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

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

mips

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

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

mn10300

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

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

openrisc

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

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

parisc

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

2013-12-18 16:42:06 -05:00

powerpc

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

2013-12-18 16:42:06 -05:00

s390

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

2013-12-18 16:42:06 -05:00

score

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

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

sh

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

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

sparc

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

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

tile

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

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

um

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

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

unicore32

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

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

x86

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

2013-12-18 16:42:06 -05:00

xtensa

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

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

.gitignore

…

Kconfig

kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS

2013-11-15 09:32:22 +09:00