David S. Miller 182ad468e7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/cavium/Kconfig The cavium conflict was overlapping dependency changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-08-13 16:23:11 -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/md5 - use md5 IV MD5_HX instead of their raw value	2015-05-18 12:20:20 +08:00
include	sparc64: Fix userspace FPU register corruptions.	2015-08-06 19:13:25 -07:00
kernel	RTC for 4.2	2015-06-25 18:55:33 -07:00
lib	sparc64: Fix userspace FPU register corruptions.	2015-08-06 19:13:25 -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	bpf, x86/sparc: show actual number of passes in bpf_jit_dump	2015-07-30 11:13:21 -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	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
Makefile	sparc: Add "install" target	2014-08-04 20:45:59 -07:00