David S. Miller 739e4a758e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/r8152.c net/netfilter/nfnetlink.c Both r8152 and nfnetlink conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-10-02 11:25:43 -07:00
..
alchemy	MIPS: Alchemy: Fix db1200 PSC clock enablement	2014-08-26 02:18:53 +02:00
ar7
ath79
bcm47xx	Merge tag 'master-2014-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2014-09-26 15:39:24 -04:00
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	mips: Update some more defconfigs which were missing CONFIG_NET.	2014-09-24 13:44:16 -04:00
dec
emma
fw
include	MIPS: Move CPU topology macros to topology.h	2014-08-27 13:44:44 +02:00
jazz
jz4740
kernel	MIPS: mcount: Adjust stack pointer for static trace in MIPS32	2014-09-26 11:41:17 +02:00
kvm
lantiq
lasat
lib
loongson	MIPS: Loongson: Fix COP2 usage for preemptible kernel	2014-08-26 02:18:55 +02:00
loongson1
math-emu	MIPS: Fix MFC1 & MFHC1 emulation for 64-bit MIPS systems	2014-09-26 11:33:11 +02:00
mm	Two very simple bugfixes, affecting all supported architectures.	2014-09-22 11:58:23 -07:00
mti-malta	MIPS: Malta: Improve system memory detection for '{e, }memsize' >= 2G	2014-08-26 02:18:54 +02:00
mti-sead3
net	next: mips: bpf: Fix build failure	2014-09-30 16:54:51 -04:00
netlogic
oprofile
paravirt
pci
pmcs-msp71xx	MIPS: MSP71xx: remove unused plat_irq_dispatch() argument	2014-08-26 02:18:52 +02:00
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