David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
boot	x86/boot: Use CROSS_COMPILE prefix for readelf	2017-05-21 13:04:27 +02:00
configs
crypto
entry	Revert "x86/entry: Fix the end of the stack for newly forked tasks"	2017-05-24 09:05:16 +02:00
events	perf/core improvements and fixes:	2017-05-03 19:28:27 +02:00
hyperv	char/misc patches for 4.12-rc1	2017-05-04 19:15:35 -07:00
ia32
include	Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-05-27 09:06:43 -07:00
kernel	Bug fixes (ARM, s390, x86)	2017-06-11 11:07:25 -07:00
kvm	KVM: async_pf: avoid async pf injection when in guest mode	2017-06-11 08:39:24 +02:00
lguest
lib	x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility	2017-05-05 08:31:05 +02:00
math-emu
mm	Revert "x86/PAT: Fix Xorg regression on CPUs that don't support PAT"	2017-06-01 15:52:23 +02:00
net	bpf: Add jited_len to struct bpf_prog	2017-06-06 15:41:24 -04:00
oprofile
pci	pci-v4.12-changes	2017-05-08 19:03:25 -07:00
platform	x86/efi: Correct EFI identity mapping under 'efi=old_map' when KASLR is enabled	2017-05-28 11:06:16 +02:00
power	x86/mm: Add support for gbpages to kernel_ident_mapping_init()	2017-05-08 08:28:40 +02:00
purgatory
ras
realmode	x86: use set_memory.h header	2017-05-08 17:15:13 -07:00
tools
um	Merge branch 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2017-05-13 10:20:02 -07:00
video
xen	xen: make xen_flush_tlb_all() static	2017-05-19 08:04:25 +02:00
.gitignore
Kbuild
Kconfig	security/keys: add CONFIG_KEYS_COMPAT to Kconfig	2017-06-09 13:29:45 +10:00
Kconfig.cpu
Kconfig.debug
Makefile	x86/build: Permit building with old make versions	2017-05-24 09:05:17 +02:00
Makefile.um
Makefile_32.cpu