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
..
68000
68360
amiga	genirq: Remove irq argument from irq flow handlers	2015-09-16 15:47:51 +02:00
apollo
atari
bvme6000
coldfire	genirq: Remove irq argument from irq flow handlers	2015-09-16 15:47:51 +02:00
configs	m68k/defconfig: Update defconfigs for v4.3-rc1	2015-09-28 10:01:09 +02:00
emu	block: add a bi_error field to struct bio	2015-07-29 08:55:15 -06:00
fpsp040
hp300
ifpsp060
include	m68k: Define asmlinkage_protect	2015-09-28 09:59:45 +02:00
kernel	m68k: Wire up membarrier	2015-09-28 09:59:44 +02:00
lib
mac	m68k/mac: Export Peripheral System Controller (PSC) base address to modules	2015-09-29 21:11:13 -07:00
math-emu
mm
mvme16x
mvme147
q40
sun3
sun3x
tools/amiga
install.sh
Kconfig	kexec: split kexec_load syscall from kexec core code	2015-09-10 13:29:01 -07:00
Kconfig.bus
Kconfig.cpu	m68knommu: make ColdFire SoC selection a choice	2015-07-13 09:34:39 +10:00
Kconfig.debug
Kconfig.devices
Kconfig.machine
Makefile