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
avr32	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
blackfin
c6x
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
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
metag
microblaze
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
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
sh
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-08 23:07:53 -04:00
tile
um
unicore32
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