David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simply overlapping changes. In the net/ipv4/route.c case the code had simply moved around a little bit and the same fix was made in both 'net' and 'net-next'. In the net/sched/sch_generic.c case a fix in 'net' happened at the same time that a new argument was added to qdisc_hash_add(). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-15 21:16:30 -04:00
..
boot	sparc: Add "install" target	2014-08-04 20:45:59 -07:00
configs	sparc64:Support User Probes for sparc	2016-12-11 18:01:51 -08:00
crypto	crypto: sparc - initialize blkcipher.ivsize	2015-10-08 21:36:48 +08:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2017-04-08 01:42:05 -07:00
lib	arch/sparc: Avoid DCTI Couples	2017-03-27 21:51:40 -07:00
math-emu	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
mm	sparc32: Export vac_cache_size to fix build error	2017-04-06 12:03:30 -07:00
net	sparc: Fix misspellings in comments.	2016-03-20 21:28:58 -07:00
oprofile
power	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2014-10-11 20:36:34 -04:00
prom	sparc: fixing ident and beautifying code	2016-10-06 01:46:40 -04:00
Kbuild
Kconfig	net:add one common config ARCH_WANT_RELAX_ORDER to support relax ordering	2017-01-18 16:33:00 -05:00
Kconfig.debug
Makefile	sparc32: Add -Wa,-Av8 to KBUILD_CFLAGS.	2016-03-01 00:24:04 -05:00