David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
alchemy
ar7
ath79
bcm47xx
bcm63xx	MIPS: BCM63xx: delete double assignment	2014-08-26 02:18:58 +02:00
boot	MIPS: ZBOOT: add missing <linux/string.h> include	2014-08-26 02:18:58 +02:00
cavium-octeon	MIPS: OCTEON: make get_system_type() thread-safe	2014-08-26 02:18:57 +02:00
cobalt
configs
dec
emma
fw
include	MIPS: Move CPU topology macros to topology.h	2014-08-27 13:44:44 +02:00
jazz
jz4740
kernel	MIPS: Wire up new syscalls getrandom and memfd_create.	2014-08-26 03:03:40 +02:00
kvm
lantiq
lasat
lib
loongson
loongson1
math-emu
mm	Two very simple bugfixes, affecting all supported architectures.	2014-09-22 11:58:23 -07:00
mti-malta
mti-sead3
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-09-23 12:09:27 -04:00
netlogic
oprofile
paravirt
pci
pmcs-msp71xx
pnx833x
power
ralink
rb532
sgi-ip22
sgi-ip27
sgi-ip32
sibyte
sni
txx9
vr41xx
Kbuild
Kbuild.platforms
Kconfig	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2014-09-19 09:06:39 -07:00
Kconfig.debug
Makefile	MIPS: SmartMIPS: Disable assembler warnings	2014-09-17 14:29:03 +02:00