David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
appldata	s390: appldata: drop owner assignment from platform_drivers	2014-10-20 16:20:13 +02:00
boot	s390/boot/decompression: disable floating point in decompressor	2015-09-29 14:45:10 +02:00
configs	s390/defconfig: set SCSI_DH=y	2015-10-01 10:48:36 +02:00
crypto	s390/crypto: add cpu feature modaliases for crypto modules	2015-07-22 09:58:02 +02:00
hypfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-07-04 19:36:06 -07:00
include	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2015-10-06 14:59:36 +01:00
kernel	s390/vtime: correct scaled cputime of partially idle CPUs	2015-09-30 16:22:38 +02:00
kvm	KVM: s390: Replace incorrect atomic_or with atomic_andnot	2015-09-16 17:01:06 +02:00
lib	Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-09-03 15:46:07 -07:00
mm	libnvdimm for 4.3:	2015-09-08 14:35:59 -07:00
net	ebpf: migrate bpf_prog's flags to bitfield	2015-10-03 05:02:39 -07:00
numa	s390/numa: use correct type for node_to_cpumask_map	2015-09-23 09:18:56 +02:00
oprofile	s390/oprofile: fix compile error	2015-07-01 09:34:39 +02:00
pci	dma-mapping: consolidate dma_set_mask	2015-09-10 13:29:01 -07:00
defconfig	s390: new default configuration	2015-06-25 09:39:25 +02:00
Kbuild	s390/numa: add core infrastructure	2015-08-03 18:40:25 +02:00
Kconfig	kexec: split kexec_load syscall from kexec core code	2015-09-10 13:29:01 -07:00
Kconfig.debug	Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS	2013-04-30 17:04:09 -07:00
Makefile	s390/sclp: convert early sclp console code to C	2015-07-29 09:11:39 +02:00