David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between 1c385f1fdf ("caif-hsi: Replace platform device with ops structure.") in the net-next tree and commit 39abbaef19 ("caif-hsi: Postpone init of HIS until open()") in the net tree. I did my best with that one and will ask Sjur to check it out. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-28 17:37:00 -07: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	sparc: remove two unused headers	2012-06-11 17:05:54 -07:00
kernel	Fix typo in printed messages	2012-06-24 11:03:52 -07:00
lib	sparc: use the new generic strnlen_user() function	2012-05-26 11:33:54 -07:00
math-emu	sparc64: Fix several bugs in quad floating point emulation.	2012-05-25 00:31:56 -07:00
mm	sparc32: srmmu_probe now knows about leon too	2012-05-27 23:52:51 -07:00
net	sparc bpf_jit: support BPF_S_ANC_ALU_XOR_X instruction	2012-06-06 10:20:21 -07:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
prom	sparc32: drop sun4c support	2012-05-11 19:27:44 -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	sparc: fix bad merge of sparc Kconfig	2012-05-27 21:16:14 -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