David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-12-18 16:42:06 -05:00

..

boot

x86, build: Pass in additional -mno-mmx, -mno-sse options

2013-12-09 15:52:39 -08:00

configs

x86, defconfig: Add DEVTMPFS and DEVTMPFS_MOUNT to *86*_defconfig

2013-11-04 20:01:55 -08:00

crypto

crypto: sha256_ssse3 - also test for BMI2

2013-10-07 14:17:10 +08:00

ia32

constify copy_siginfo_to_user{,32}()

2013-11-09 00:16:29 -05:00

include

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-12-18 16:42:06 -05:00

kernel

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-12-17 12:35:05 -08:00

kvm

KVM: x86: fix guest-initiated crash with x2apic (CVE-2013-6376)

2013-12-12 22:46:18 +01:00

lguest

lguest: fix GPF in guest when using gdb.

2013-09-06 08:09:28 +09:30

lib

lib: introduce arch optimized hash library

2013-12-17 14:27:17 -05:00

math-emu

x86: Rename trap_no to trap_nr in thread_struct

2012-03-13 06:24:09 +01:00

mm

x86, mm: do not leak page->ptl for pmd page tables

2013-11-21 16:42:28 -08:00

net

net: x86: bpf: don't forget to free sk_filter (v2)

2013-11-07 19:06:52 -05:00

oprofile

perf: Fix arch_perf_out_copy_user default

2013-11-06 12:34:25 +01:00

pci

ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node

2013-11-14 23:14:43 +01:00

platform

x86, efi: Don't use (U)EFI time services on 32 bit

2013-12-10 15:02:34 -08:00

power

x86, asmlinkage, power: Make various symbols used by the suspend asm code visible

2013-08-06 14:21:03 -07:00

realmode

x86, build: Pass in additional -mno-mmx, -mno-sse options

2013-12-09 15:52:39 -08:00

syscalls

unify compat fanotify_mark(2), switch to COMPAT_SYSCALL_DEFINE

2013-05-09 13:46:38 -04:00

tools

Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 08:39:38 -07:00

um

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

2013-11-19 11:42:32 -08:00

vdso

seqcount: Add lockdep functionality to seqcount/seqlock structures

2013-11-06 12:40:26 +01:00

video

x86: Use vga_default_device() when determining whether an fb is primary

2012-04-24 09:50:17 +01:00

xen

Merge tag 'stable/for-linus-3.13-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2013-11-15 13:34:37 +09: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

math64: Add mul_u64_u32_shr()

2013-12-11 15:52:34 +01:00

Kconfig.cpu

x86, 386 removal: Document Nx586 as a 386 and thus unsupported

2012-11-29 13:28:39 -08:00

Kconfig.debug

x86/efi: Add EFI framebuffer earlyprintk support

2013-10-28 18:09:58 +00:00

Makefile

x86, build: Pass in additional -mno-mmx, -mno-sse options

2013-12-09 15:52:39 -08:00

Makefile_32.cpu

x86, 386 removal: Remove CONFIG_M386 from Kconfig

2012-11-29 13:23:01 -08:00

Makefile.um

um: fix linker script generation

2012-04-09 13:59:00 -04:00