David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

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

2013-10-08 23:07:53 -04:00

..

alpha

net: introduce SO_MAX_PACING_RATE

2013-09-28 15:35:41 -07:00

arc

ARC: Use clockevents_config_and_register over clockevents_register_device

2013-09-27 16:28:48 +05:30

arm

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

2013-10-08 23:07:53 -04:00

arm64

arm64: Widen hwcap to be 64 bit

2013-09-20 09:56:07 +01:00

avr32

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

2013-10-01 17:06:14 -04:00

blackfin

Merge branch 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2013-09-13 07:31:38 -07:00

c6x

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

cris

net: introduce SO_MAX_PACING_RATE

2013-09-28 15:35:41 -07:00

frv

net: introduce SO_MAX_PACING_RATE

2013-09-28 15:35:41 -07:00

h8300

net: introduce SO_MAX_PACING_RATE

2013-09-28 15:35:41 -07:00

hexagon

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

ia64

net: introduce SO_MAX_PACING_RATE

2013-09-28 15:35:41 -07:00

m32r

net: introduce SO_MAX_PACING_RATE

2013-09-28 15:35:41 -07:00

m68k

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

metag

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

microblaze

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

mips

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

2013-10-01 17:06:14 -04:00

mn10300

net: introduce SO_MAX_PACING_RATE

2013-09-28 15:35:41 -07:00

openrisc

openrisc: clean-up prom.h

2013-09-24 21:12:27 -05:00

parisc

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

2013-10-01 17:06:14 -04:00

powerpc

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

2013-10-08 23:07:53 -04:00

s390

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

2013-10-08 23:07:53 -04:00

score

Score: Modify the Makefile of Score, remove -mlong-calls for compiling

2013-09-26 03:46:03 +08:00

sh

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

sparc

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

2013-10-08 23:07:53 -04:00

tile

tile: remove stray blank space

2013-09-16 15:47:32 -04:00

um

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

unicore32

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

x86

net: fix unsafe set_memory_rw from softirq

2013-10-07 15:16:45 -04:00

xtensa

net: introduce SO_MAX_PACING_RATE

2013-09-28 15:35:41 -07:00

.gitignore

…

Kconfig

mutex: replace CONFIG_HAVE_ARCH_MUTEX_CPU_RELAX with simple ifdef

2013-09-28 12:46:21 +02:00