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

Conflicts:
	Documentation/devicetree/bindings/net/micrel-ks8851.txt
	net/core/netpoll.c

The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.

In micrel-ks8851.txt we simply have overlapping changes.

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

2014-03-25 20:29:20 -04:00

..

alpha

alpha: fix broken network checksum

2014-01-31 09:21:55 -08:00

arc

ARC: Use correct PTAG register for icache flush

2014-03-07 10:12:56 -08:00

arm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-03-25 20:29:20 -04:00

arm64

Three x86 fixes and one for ARM/ARM64. In particular, nested

2014-02-28 11:45:03 -08:00

avr32

avr32: add generic vga.h to Kbuild

2014-02-17 11:24:48 +01:00

blackfin

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2014-01-31 09:31:14 -08:00

c6x

Build fix for c6x

2014-03-07 09:52:46 -08:00

cris

cris: convert ffs from an object-like macro to a function-like macro

2014-03-10 17:26:21 -07:00

frv

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2014-01-30 16:58:05 -08:00

hexagon

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2014-01-25 11:17:34 -08:00

ia64

mm: fix GFP_THISNODE callers and clarify

2014-03-10 17:26:19 -07:00

m32r

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2014-01-25 11:17:34 -08:00

m68k

m68k: Wire up sched_setattr and sched_getattr

2014-02-10 20:10:20 +01:00

metag

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2014-01-25 11:17:34 -08:00

microblaze

microblaze: Fix a typo when disabling stack protection

2014-02-10 07:44:11 +01:00

mips

MIPS: Make local_irq_disable macro safe for non-Mipsr2

2014-03-20 13:46:15 +01:00

mn10300

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2014-01-30 16:58:05 -08:00

openrisc

OpenRISC updates for 3.14

2014-01-30 17:08:41 -08:00

parisc

parisc: locks: remove redundant arch_*_relax operations

2014-03-23 17:01:23 +01:00

powerpc

A fix for a PowerPC bug that was introduced during the 3.14 merge window.

2014-03-18 11:32:08 -07:00

s390

s390/pci/dma: use correct segment boundary size

2014-02-21 08:48:27 +01:00

score

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2014-01-31 09:31:14 -08:00

sh

sh: prefix sh-specific "CCR" and "CCR2" by "SH_"

2014-03-04 07:55:49 -08:00

sparc

sparc64: Make sure %pil interrupts are enabled during hypervisor yield.

2014-03-24 14:45:12 -04:00

tile

tile: remove compat_sys_lookup_dcookie declaration to fix compile error

2014-02-01 10:55:15 -08:00

um

uml/net_kern: Call dev_consume_skb_any instead of dev_kfree_skb.

2014-03-24 15:13:35 -07:00

unicore32

arch/unicore32/kernel/early_printk.c:setup_early_printk: missing initialization

2014-01-27 21:02:39 -08:00

x86

PCI updates for v3.14:

2014-03-19 16:15:54 -07:00

xtensa

Xtensa fixes for 3.14:

2014-02-24 00:34:36 -08:00

.gitignore

…

Kconfig

stackprotector: Introduce CONFIG_CC_STACKPROTECTOR_STRONG

2013-12-20 09:38:40 +01:00