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	x86, efi stub: Add .reloc section back into image	2012-06-07 09:52:33 -07:00
configs	x86/kconfig: Remove CONFIG_TR=y from the defconfigs	2012-03-24 08:18:03 +01:00
crypto	crypto: aesni-intel - fix unaligned cbc decrypt for x86-32	2012-05-31 20:53:22 +10:00
ia32	most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set	2012-06-01 12:58:51 -04:00
include/asm	thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE	2012-06-20 14:39:35 -07:00
kernel	Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-06-15 17:35:01 -07:00
kvm	KVM: MMU: fix huge page adapted on non-PAE host	2012-05-28 17:41:15 +03:00
lguest	lguest: Make sure interrupt is allocated ok by lguest_setup_irq	2012-01-12 15:44:47 +10:30
lib	perf/x86: Fix broken LBR fixup code	2012-06-13 15:00:28 +02:00
math-emu	x86: Rename trap_no to trap_nr in thread_struct	2012-03-13 06:24:09 +01:00
mm	x86/mm: Fix some kernel-doc warnings	2012-06-11 10:54:45 +02:00
net	x86 bpf_jit: support BPF_S_ANC_ALU_XOR_X instruction	2012-06-06 09:42:44 -07:00
oprofile	x86: Factor out TIF_IA32 from 32-bit address space	2012-02-20 12:48:46 -08:00
pci	Features:	2012-05-24 16:02:08 -07:00
platform	kmsg - kmsg_dump() use iterator to receive log buffer content	2012-06-15 14:53:59 -07:00
power	x86, kvm: Call restore_sched_clock_state() only after %gs is initialized	2012-04-02 13:53:00 +02:00
realmode	x86, realmode: Move end signature into header.S	2012-05-21 00:02:45 -07:00
syscalls	syscalls, x86: add __NR_kcmp syscall	2012-05-31 17:49:32 -07:00
tools	x86/decoder: Fix bsr/bsf/jmpe decoding with operand-size prefix	2012-06-06 08:54:18 +02:00
um	x86, um: Correct syscall table type attributes breaking gcc 4.8	2012-06-09 12:51:09 -07:00
vdso	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
video	x86: Use vga_default_device() when determining whether an fb is primary	2012-04-24 09:50:17 +01:00
xen	Five bug-fixes:	2012-06-15 17:17:15 -07:00
.gitignore	x86/kprobes: Add arch/x86/tools/insn_sanity to .gitignore	2012-01-16 08:21:59 +01:00
Kbuild	x86, realmode: realmode.bin infrastructure	2012-05-08 11:41:48 -07:00
Kconfig	x86, efi: Add EFI boot stub documentation	2012-06-01 09:11:41 -07:00
Kconfig.cpu	x86: Tighten dependencies of CPU_SUP_*_32	2012-03-08 10:57:34 +01:00
Kconfig.debug	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-11 19:13:40 -08:00
Makefile	md updates for 3.5	2012-05-23 17:08:40 -07:00
Makefile.um	um: fix linker script generation	2012-04-09 13:59:00 -04:00
Makefile_32.cpu	…