David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
boot	lib/decompressors: use real out buf size for gunzip with kernel	2015-09-10 13:29:01 -07:00
configs	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2015-09-04 15:49:32 -07:00
crypto	crypto: camellia_aesni_avx - Fix CPU feature checks	2015-10-08 21:36:49 +08:00
entry	x86/nmi/64: Fix a paravirt stack-clobbering bug in the NMI code	2015-09-22 22:40:36 +02:00
ia32	x86/compat: Move copy_siginfo_*_user32() to signal_compat.c	2015-07-06 15:28:55 +02:00
include	Bug fixes for system management mode emulation. The first two patches	2015-10-14 10:01:32 -07:00
kernel	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-10-03 10:53:05 -04:00
kvm	KVM: x86: fix RSM into 64-bit protected mode	2015-10-14 16:39:52 +02:00
lguest	genirq: Remove irq argument from irq flow handlers	2015-09-16 15:47:51 +02:00
lib	x86/asm/delay: Introduce an MWAITX-based delay with a configurable timer	2015-08-22 14:52:16 +02:00
math-emu	Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes	2015-08-18 09:39:47 +02:00
mm	x86/mm: Set NX on gap between __ex_table and rodata	2015-10-02 09:21:06 +02:00
net	ebpf: migrate bpf_prog's flags to bitfield	2015-10-03 05:02:39 -07:00
oprofile
pci	PCI: Revert "PCI: Call pci_read_bridge_bases() from core instead of arch code"	2015-09-15 13:18:04 -05:00
platform	x86/efi: Fix boot crash by mapping EFI memmap entries bottom-up at runtime, instead of top-down	2015-10-01 12:51:28 +02:00
power	x86/ldt: Make modify_ldt synchronous	2015-07-31 10:23:23 +02:00
purgatory
ras	x86/ras: Move AMD MCE injector to arch/x86/ras/	2015-08-13 10:12:54 +02:00
realmode
tools
um	x86/asm/tsc: Remove rdtsc_barrier()	2015-07-06 15:23:30 +02:00
video
xen	x86/xen/p2m: hint at the last populated P2M entry	2015-10-06 13:54:20 +01:00
.gitignore
Kbuild	x86/asm/entry, x86/vdso: Move the vDSO code to arch/x86/entry/vdso/	2015-06-03 18:51:37 +02:00
Kconfig	swiotlb: Enable it under x86 PAE	2015-10-07 15:31:35 -04:00
Kconfig.cpu
Kconfig.debug	x86/entry/64, x86/nmi/64: Add CONFIG_DEBUG_ENTRY NMI testing code	2015-07-17 12:50:14 +02:00
Makefile	Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-09-01 08:40:25 -07:00
Makefile.um
Makefile_32.cpu