linux/arch/x86
David S. Miller 739e4a758e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/r8152.c
	net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-10-02 11:25:43 -07:00
..
boot Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-09-27 14:23:13 -07:00
configs
crypto crypto: aesni - disable "by8" AVX CTR optimization 2014-09-24 21:15:31 +08:00
ia32
include Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-09-27 14:23:13 -07:00
kernel sched: Fix unreleased llc_shared_mask bit during CPU hotplug 2014-09-24 15:13:20 +02:00
kvm
lguest
lib
math-emu
mm
net
oprofile
pci PCI updates for v3.17: 2014-09-19 10:50:30 -07:00
platform
power
purgatory
realmode
syscalls bpf: enable bpf syscall on x64 and i386 2014-09-26 15:05:14 -04:00
tools
um
vdso
video
xen
.gitignore
Kbuild
Kconfig
Kconfig.cpu
Kconfig.debug
Makefile
Makefile_32.cpu
Makefile.um