David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/team/team.c drivers/net/usb/qmi_wwan.c net/batman-adv/bat_iv_ogm.c net/ipv4/fib_frontend.c net/ipv4/route.c net/l2tp/l2tp_netlink.c The team, fib_frontend, route, and l2tp_netlink conflicts were simply overlapping changes. qmi_wwan and bat_iv_ogm were of the "use HEAD" variety. With help from Antonio Quartulli. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-28 14:40:49 -04: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
include/asm	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	2012-07-30 17:25:21 -07:00
kernel	sparc: fix the return value of module_alloc()	2012-09-21 12:14:20 -07:00
lib	sparc64: Consistently use fsrc2 rather than fmovd in optimized asm.	2012-06-27 01:25:23 -07:00
math-emu	sparc64: Fix several bugs in quad floating point emulation.	2012-05-25 00:31:56 -07:00
mm	sparc64: Be less verbose during vmemmap population.	2012-08-15 00:37:29 -07:00
net	sparc: bpf_jit_comp: add XOR instruction for BPF JIT JIT	2012-09-27 18:04:35 -04: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next	2012-05-21 10:32:01 -07:00
Kconfig	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	2012-07-30 17:25:21 -07: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