David S. Miller 24bc518a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/iwlwifi/pcie/tx.c Minor iwlwifi conflict in TX queue disabling between 'net', which removed a bogus warning, and 'net-next' which added some status register poking code. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-11-25 12:49:17 -05:00
..
boot	sparc32: drop build time btfixup patching	2012-05-14 14:05:10 -07:00
configs	perf: Remove PERF_COUNTERS config option	2012-04-26 13:52:52 +02:00
crypto	sparc64: Fix build with mix of modular vs. non-modular crypto drivers.	2012-11-09 20:55:16 -08:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-25 12:49:17 -05:00
kernel	sparc64: not any error from do_sigaltstack() should fail rt_sigreturn()	2012-11-18 22:27:03 -05:00
lib	sparc: Support atomic64_dec_if_positive properly.	2012-11-09 19:37:59 -08:00
math-emu	sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.	2012-10-26 15:18:37 -07:00
mm	sparc64: Add global PMU register dumping via sysrq.	2012-10-16 09:34:01 -07:00
net	sparc: bpf_jit_comp: add VLAN instructions for BPF JIT	2012-11-06 17:41:42 -05:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
prom	sparc32: Remove superfluous extern declarations for prom_*() functions	2012-06-27 01:27:45 -07:00
Kbuild	sparc64: Add SHA1 driver making use of the 'sha1' instruction.	2012-08-20 15:08:49 -07:00
Kconfig	sparc: Support atomic64_dec_if_positive properly.	2012-11-09 19:37:59 -08:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-05-21 19:43:57 -07:00