linux_dsm_epyc7002/arch
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
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
blackfin
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
hexagon
ia64 mm: fix GFP_THISNODE callers and clarify 2014-03-10 17:26:19 -07:00
m32r
m68k
metag
microblaze
mips MIPS: Make local_irq_disable macro safe for non-Mipsr2 2014-03-20 13:46:15 +01:00
mn10300
openrisc
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
score
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
um uml/net_kern: Call dev_consume_skb_any instead of dev_kfree_skb. 2014-03-24 15:13:35 -07:00
unicore32
x86 PCI updates for v3.14: 2014-03-19 16:15:54 -07:00
xtensa
.gitignore
Kconfig