David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
boot	sparc: Add "install" target	2014-08-04 20:45:59 -07:00
configs	perf: Remove PERF_COUNTERS config option	2012-04-26 13:52:52 +02:00
crypto	sparc64: fix sparse warnings in aes_glue.c	2014-05-18 19:01:33 -07:00
include	sparc: Hook up memfd_create system call.	2014-08-13 22:00:09 -07:00
kernel	sparc: Hook up memfd_create system call.	2014-08-13 22:00:09 -07:00
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next	2014-08-06 09:41:23 -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: Fix up merge thinko.	2014-08-05 19:09:19 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-09-23 12:09:27 -04:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
power	sparc64: Hibernation support	2013-03-20 11:06:54 -07:00
prom	sparc64: fix sparse warnings in smp_64.c	2014-05-18 19:01:31 -07:00
Kbuild	sparc64: Add SHA1 driver making use of the 'sha1' instruction.	2012-08-20 15:08:49 -07:00
Kconfig	lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual Kconfig	2014-08-08 15:57:26 -07: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