leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4180442058
linux/arch/mips
History
David S. Miller 4180442058 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	net/ipv4/tcp_metrics.c

Overlapping changes between the "don't create two tcp metrics objects
with the same key" race fix in net and the addition of the destination
address in the lookup key in net-next.

Minor overlapping changes in bnx2x driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-18 00:55:41 -08:00
..
alchemy MIPS: Panic messages should not end in \n. 2013-10-29 21:24:19 +01:00
ar7
ath79 MIPS: ath79: Remove ar933x_uart_platform.h header 2013-10-29 21:23:49 +01:00
bcm47xx b44: use fixed PHY device if we do not find any 2013-12-20 20:48:49 -05:00
bcm63xx MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks 2013-09-18 20:25:19 +02:00
boot MIPS: remove duplicate define 2013-11-06 15:51:19 +01:00
cavium-octeon MIPS: Panic messages should not end in \n. 2013-10-29 21:24:19 +01:00
cobalt MIPS: Cobalt: Move to 8250/16550 serial early printk driver 2013-10-29 21:24:38 +01:00
configs MMC highlights for 3.13: 2013-11-18 14:47:30 -08:00
dec DEC: Whitespace cleanup 2013-10-29 21:24:44 +01:00
emma
fw
include Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-18 00:55:41 -08:00
jazz
jz4740
kernel Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-11-13 15:34:18 +09:00
kvm kvm: Add struct kvm arg to memslot APIs 2013-10-17 15:49:23 +02:00
lantiq DeviceTree updates for 3.13. This is a bit larger pull request than 2013-11-12 16:52:17 +09:00
lasat
lib
loongson
loongson1
math-emu
mm MIPS: fix blast_icache32 on loongson2 2014-01-15 14:19:42 +07:00
mti-malta Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2013-11-08 08:32:58 +09:00
mti-sead3 mips: add explicit includes of prom.h 2013-10-09 20:04:05 -05:00
netlogic DeviceTree updates for 3.13. This is a bit larger pull request than 2013-11-12 16:52:17 +09:00
oprofile MIPS: Optimize current_cpu_type() for better code. 2013-09-17 18:50:53 +02:00
pci DeviceTree updates for 3.13. This is a bit larger pull request than 2013-11-12 16:52:17 +09:00
pmcs-msp71xx
pnx833x
power
ralink DeviceTree updates for 3.13. This is a bit larger pull request than 2013-11-12 16:52:17 +09:00
rb532
sgi-ip22
sgi-ip27
sgi-ip32
sibyte MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks 2013-09-18 20:25:19 +02:00
sni MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks 2013-09-18 20:25:19 +02:00
txx9
vr41xx
Kbuild
Kbuild.platforms MIPS: PowerTV: Remove support code. 2013-10-29 21:25:17 +01:00
Kconfig Kconfig cleanups for v3.13 2013-11-15 14:05:15 -08:00
Kconfig.debug MIPS: Add 8250/16550 serial early printk driver 2013-10-29 21:24:36 +01:00
Makefile MIPS: Kbuild: Do not allow building vmlinuz when !ZBOOT 2013-10-29 21:24:26 +01:00