You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		13 years ago
..
boot	sparc32: drop build time btfixup patching	13 years ago
configs	perf: Remove PERF_COUNTERS config option	13 years ago
include/asm	sparc: remove two unused headers	13 years ago
kernel	Fix typo in printed messages	13 years ago
lib	sparc: use the new generic strnlen_user() function	13 years ago
math-emu	sparc64: Fix several bugs in quad floating point emulation.	13 years ago
mm	sparc32: srmmu_probe now knows about leon too	13 years ago
net	sparc bpf_jit: support BPF_S_ANC_ALU_XOR_X instruction	13 years ago
oprofile	…
prom	sparc32: drop sun4c support	13 years ago
Kbuild	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next	13 years ago
Kconfig	sparc: fix bad merge of sparc Kconfig	13 years ago
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	14 years ago
Makefile	Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	13 years ago