David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -04:00
..
boot	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-05-20 11:28:32 -07:00
configs
crypto
entry	x86/vdso: Remove unused file	2018-05-05 09:02:36 +02:00
events	perf/x86/cstate: Fix possible Spectre-v1 indexing for pkg_msr	2018-05-05 08:37:31 +02:00
hyperv
ia32
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -04:00
kernel	Merge branch 'speck-v20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-05-21 11:23:26 -07:00
kvm	Merge branch 'speck-v20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-05-21 11:23:26 -07:00
lib
math-emu
mm	x86/pkeys: Override pkey when moving away from PROT_EXEC	2018-05-14 11:14:45 +02:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2018-05-07 23:35:08 -04:00
oprofile
pci
platform
power	x86/power/64: Fix page-table setup for temporary text mapping	2018-04-20 11:52:00 +02:00
purgatory	kernel/kexec_file.c: move purgatories sha256 to common code	2018-04-13 17:10:28 -07:00
ras
realmode
tools
um	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2018-04-11 16:36:47 -07:00
video
xen	Some of the ftrace internal events use a zero for a data size of	2018-05-16 16:45:23 -07:00
.gitignore
Kbuild
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2018-05-07 23:35:08 -04:00
Kconfig.cpu
Kconfig.debug
Makefile
Makefile_32.cpu
Makefile.um