kernel_optimize_test/arch/x86
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
configs
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
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
math-emu
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
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
purgatory
ras
realmode
tools
um
video
xen x86/xen/p2m: hint at the last populated P2M entry 2015-10-06 13:54:20 +01:00
.gitignore
Kbuild
Kconfig swiotlb: Enable it under x86 PAE 2015-10-07 15:31:35 -04:00
Kconfig.cpu
Kconfig.debug
Makefile
Makefile_32.cpu
Makefile.um