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
..
boot	sparc: Add "install" target	2014-08-04 20:45:59 -07:00
configs	sparc: Set CONFIG_NET=y in defconfigs	2014-09-24 13:38:30 -04:00
crypto	crypto: sparc - initialize blkcipher.ivsize	2015-10-08 21:36:48 +08:00
include	dma-mapping: consolidate dma_set_mask	2015-09-10 13:29:01 -07:00
kernel	genirq: Remove irq argument from irq flow handlers	2015-09-16 15:47:51 +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
math-emu	arch/sparc/math-emu/math_32.c: drop stray break operator	2014-08-04 20:29:06 -07:00
mm	sparc64: Convert BUG_ON to warning	2015-06-25 06:01:02 -07:00
net	ebpf: migrate bpf_prog's flags to bitfield	2015-10-03 05:02:39 -07:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
power	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2014-10-11 20:36:34 -04:00
prom	sparc64: Fix register corruption in top-most kernel stack frame during boot.	2014-10-24 09:52:49 -07:00
Kbuild	sparc64: Add SHA1 driver making use of the 'sha1' instruction.	2012-08-20 15:08:49 -07:00
Kconfig	sparc: time: Replace update_persistent_clock() with CONFIG_RTC_SYSTOHC	2015-06-25 01:13:43 +02:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	sparc: Add "install" target	2014-08-04 20:45:59 -07:00