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	m68k: Use vsprintf %pM extension	2015-06-16 16:45:38 +10:00
68360	m68k: Use vsprintf %pM extension	2015-06-16 16:45:38 +10:00
amiga	genirq: Remove irq argument from irq flow handlers	2015-09-16 15:47:51 +02:00
apollo	m68k/apollo: Convert printk to pr_foo()	2014-05-28 10:11:55 +02:00
atari	m68k/atari: Remove obsolete IRQ_TYPE_*	2015-01-15 13:44:51 +01:00
bvme6000	m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h>	2013-11-26 11:09:21 +01:00
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	Fix common misspellings	2011-03-31 11:26:23 -03:00
hp300	m68k/hp300: Convert printk to pr_foo()	2014-05-28 10:11:55 +02:00
ifpsp060	Fix common misspellings	2011-03-31 11:26:23 -03:00
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	m68k: Remove FSF address	2015-03-15 10:23:30 +01:00
mac	m68k/mac: Export Peripheral System Controller (PSC) base address to modules	2015-09-29 21:11:13 -07:00
math-emu	m68k/math-emu: unsigned issue, 'unsigned long' will never be less than zero	2013-06-24 19:44:19 +02:00
mm	mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler	2015-05-19 08:39:15 +02:00
mvme16x	m68k/mvme16x: rtc - Don't use module_init in non-modular code	2015-01-11 11:38:41 +01:00
mvme147	m68k/mvme147: config.c - Remove unused functions	2015-01-11 11:38:45 +01:00
q40	m68k: Mark functions only called from setup_arch() __init	2013-11-26 11:08:54 +01:00
sun3	sun3_scsi: Convert to platform device	2014-11-20 09:11:15 +01:00
sun3x	m68k: Remove superfluous inclusions of <asm/bootinfo.h>	2013-11-26 11:09:22 +01:00
tools/amiga	Convert files to UTF-8 and some cleanups	2007-10-19 23:21:04 +02:00
Kconfig	kexec: split kexec_load syscall from kexec core code	2015-09-10 13:29:01 -07:00
Kconfig.bus	m68k/atari: ROM port ISA adapter support	2013-04-16 21:08:11 +02:00
Kconfig.cpu	m68knommu: make ColdFire SoC selection a choice	2015-07-13 09:34:39 +10:00
Kconfig.debug	m68k: Multi-platform EARLY_PRINTK	2014-05-28 10:10:04 +02:00
Kconfig.devices	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2014-10-08 05:40:17 -04:00
Kconfig.machine	m68k: remove 16 unused boards in Kconfig.machine	2013-08-26 16:51:14 +10:00
Makefile	m68k: move non-mmu 68360 platform code	2014-09-29 09:18:35 +10:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00