David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-06-03 23:32:12 -07:00

..

alchemy

Merge branch '3.14-fixes' into mips-for-linux-next

2014-03-31 18:17:33 +02:00

ar7

MIPS: Restore init.h usage to arch/mips/ar7/time.c

2014-03-26 23:09:23 +01:00

ath79

usb: host: remove selects of USB_ARCH_HAS_?HCI

2014-02-18 12:36:38 -08:00

bcm47xx

ssb: sprom: add dev_id field for value overriding standard ID

2014-05-19 16:42:15 -04:00

bcm63xx

MIPS: Use current_cpu_type() instead of c->cputype

2014-03-31 18:17:12 +02:00

boot

mips: delete non-required instances of include <linux/init.h>

2014-01-24 22:39:56 +01:00

cavium-octeon

genirq: Allow forcing cpu affinity of interrupts

2014-04-17 23:36:27 +02:00

cobalt

MIPS: Cobalt: Move to 8250/16550 serial early printk driver

2013-10-29 21:24:38 +01:00

configs

MIPS: Loongson: Add a Loongson-3 default config file

2014-03-31 18:17:12 +02:00

dec

MIPS: DEC/SNI: O32 wrapper stack switching fixes

2014-05-13 00:29:35 +02:00

emma

MIPS: Remove panic_timeout settings

2013-11-26 12:12:27 +01:00

fw

MIPS: DEC/SNI: O32 wrapper stack switching fixes

2014-05-13 00:29:35 +02:00

include

MIPS: Fix inconsistancy of __NR_Linux_syscalls value

2014-05-25 12:43:26 +02:00

jazz

…

jz4740

mips: delete non-required instances of include <linux/init.h>

2014-01-24 22:39:56 +01:00

kernel

MIPS: ptrace: Avoid smp_processor_id() in preemptible code

2014-05-28 10:54:41 +02:00

kvm

MIPS: KVM: Remove dead code in CP0 emulation

2014-03-19 17:01:50 +01:00

lantiq

mips: dts: Fix missing device_type="memory" property in memory nodes

2014-05-16 15:22:53 +01:00

lasat

MIPS: Lasat: Replace del_timer by del_timer_sync

2014-03-31 18:17:12 +02:00

lib

MIPS: csum_partial.S CPU_DADDI_WORKAROUNDS bug fix

2014-05-13 00:29:39 +02:00

loongson

MIPS: Lemote 2F: cs5536: mfgpt: use raw locks

2014-05-28 10:48:26 +02:00

loongson1

…

math-emu

Merge branch '3.14-fixes' into mips-for-linux-next

2014-03-31 18:17:33 +02:00

mm

MIPS: R46000: Fix Micro-assembler field overflow for R4600 V2

2014-05-28 11:08:14 +02:00

mti-malta

MIPS: malta: memory.c: Initialize the 'memsize' variable

2014-05-25 12:46:24 +02:00

mti-sead3

MIPS: SEAD3: Don't use module_init in non-modular sead3-mtd.c code

2014-03-31 18:17:12 +02:00

netlogic

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2014-01-30 17:20:32 -08:00

oprofile

MIPS: Add support for the M5150 processor

2014-03-26 23:09:22 +01:00

pci

MIPS: RC32434: fix broken PCI resource initialization

2014-05-26 09:02:06 +02:00

pmcs-msp71xx

MIPS: Fix gigaton of warning building with microMIPS.

2014-03-31 18:17:12 +02:00

pnx833x

…

power

MIPS: Hibernate: Flush TLB entries in swsusp_arch_resume()

2014-03-31 10:16:53 +02:00

ralink

mips: dts: Fix missing device_type="memory" property in memory nodes

2014-05-16 15:22:53 +01:00

rb532

…

sgi-ip22

mips: Use the core irq stats function

2014-03-04 17:37:53 +01:00

sgi-ip27

mips: delete non-required instances of include <linux/init.h>

2014-01-24 22:39:56 +01:00

sgi-ip32

…

sibyte

mips: Validate online cpus in irq_set_affinity() callbacks

2014-03-12 13:07:40 +01: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: rename HAS_IOPORT to HAS_IOPORT_MAP

2014-04-07 16:36:11 -07:00

Kconfig.debug

MIPS: Fix build error due to multiple prom_putchar() definitions.

2014-03-31 10:16:52 +02:00

Makefile

MIPS: SB1: Fix excessive kernel warnings.

2014-05-28 08:42:23 +02:00