David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-01 17:06:14 -04:00
..
alchemy	MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks	2013-09-18 20:25:19 +02:00
ar7
ath79
bcm47xx
bcm63xx	MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks	2013-09-18 20:25:19 +02:00
boot	MIPS: Fix invalid symbolic link file	2013-09-19 17:04:35 +02:00
cavium-octeon	MIPS: Optimize current_cpu_type() for better code.	2013-09-17 18:50:53 +02:00
cobalt
configs
dec	MIPS: Optimize current_cpu_type() for better code.	2013-09-17 18:50:53 +02:00
emma
fw
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
jazz
jz4740
kernel	MIPS: Disable usermode switching of the FR bit for MIPS R5 CPUs.	2013-09-19 11:23:10 +02:00
kvm
lantiq
lasat
lib
loongson
loongson1
math-emu
mm	MIPS: mm: Move some checks out of 'for' loop in DMA operations	2013-09-25 17:05:44 +02:00
mti-malta	MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks	2013-09-18 20:25:19 +02:00
mti-sead3	MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks	2013-09-18 20:25:19 +02:00
netlogic	MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks	2013-09-18 20:25:19 +02:00
oprofile	MIPS: Optimize current_cpu_type() for better code.	2013-09-17 18:50:53 +02:00
pci	MIPS: PCI: pci-bcm1480: Include missing vt.h header	2013-09-19 12:50:16 +02:00
pmcs-msp71xx
pnx833x
power
powertv
ralink
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
Kconfig	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
Kconfig.debug
Makefile	MIPS: Remove useless comment about kprobe from arch/mips/Makefile	2013-09-18 18:37:48 +02:00