David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/amd/xgbe/xgbe-desc.c drivers/net/ethernet/renesas/sh_eth.c Overlapping changes in both conflict cases. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-12-10 15:48:20 -05:00
..
appldata	s390/appldata: add slab.h for kzalloc/kfree	2014-05-20 08:58:51 +02:00
boot	s390/boot: fix boot of compressed kernel built with gcc 4.9	2014-05-27 10:26:04 +02:00
configs	s390: update default configuration	2014-10-27 13:27:03 +01:00
crypto	crypto: s390 - fix aes,des ctr mode concurrency finding.	2014-05-08 21:46:09 +08:00
hypfs
include	net, lib: kill arch_fast_hash library bits	2014-12-10 15:17:46 -05:00
kernel	s390: fix machine check handling	2014-12-01 11:06:55 +01:00
kvm	KVM: s390: count vcpu wakeups in stat.halt_wakeup	2014-10-01 14:42:14 +02:00
lib	s390/uprobes: fix kprobes dependency	2014-10-17 14:45:51 +02:00
math-emu
mm	s390/mm: fixing calls of pte_unmap_unlock	2014-10-15 16:56:27 +02:00
net	net: filter: constify detection of pkt_type_offset	2014-09-13 17:07:21 -04:00
oprofile	s390: Replace __get_cpu_var uses	2014-08-26 13:45:52 -04:00
pci	s390/pci: introduce lazy IOTLB flushing for DMA unmap	2014-07-22 09:26:24 +02:00
defconfig	s390: update default configuration	2014-10-27 13:27:03 +01:00
Kbuild
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2014-10-14 03:47:00 +02:00
Kconfig.debug
Makefile	s390: pass march flag to assembly files as well	2014-09-09 08:53:28 +02:00