David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c net/ipv6/ip6_tunnel.c net/ipv6/ip6_vti.c ipv6 tunnel statistic bug fixes conflicting with consolidation into generic sw per-cpu net stats. qlogic conflict between queue counting bug fix and the addition of multiple MAC address support. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-06 17:37:45 -05:00
..
boot	sparc: Fix piggyback with newer binutils.	2012-12-03 11:24:25 -08:00
configs	perf: Remove PERF_COUNTERS config option	2012-04-26 13:52:52 +02:00
crypto	sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.	2012-12-19 15:44:31 -08:00
include	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
kernel	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
lib	sparc64: Make PAGE_OFFSET variable.	2013-11-12 15:22:34 -08:00
math-emu	sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.	2012-10-26 15:18:37 -07:00
mm	sparc64: merge fix	2013-11-18 15:08:52 -08:00
net	net: fix unsafe set_memory_rw from softirq	2013-10-07 15:16:45 -04:00
oprofile	…
power	sparc64: Hibernation support	2013-03-20 11:06:54 -07:00
prom	arch: sparc: prom: looping issue, need additional length check in the outside looping	2013-06-19 02:10:29 -07:00
Kbuild	sparc64: Add SHA1 driver making use of the 'sha1' instruction.	2012-08-20 15:08:49 -07:00
Kconfig	Kconfig cleanups for v3.13	2013-11-15 14:05:15 -08:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	sparc64: Hibernation support	2013-03-20 11:06:54 -07:00