David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -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-06-06 22:20:08 -04:00
kernel	sparc64: delete old wrap code	2017-06-06 13:45:29 -07:00
lib	sparc64: Add __multi3 for gcc 7.x and later.	2017-06-05 11:30:33 -07:00
math-emu	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
mm	sparc64: delete old wrap code	2017-06-06 13:45:29 -07:00
net	bpf: Add jited_len to struct bpf_prog	2017-06-06 15:41:24 -04: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	security/keys: add CONFIG_KEYS_COMPAT to Kconfig	2017-06-09 13:29:45 +10:00
Kconfig.debug
Makefile	sparc32: Add -Wa,-Av8 to KBUILD_CFLAGS.	2016-03-01 00:24:04 -05:00