David S. Miller c02b3741eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Overlapping changes all over. The mini-qdisc bits were a little bit tricky, however. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-01-17 00:10:42 -05:00
..
boot	Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-12-31 13:13:56 -08:00
configs
crypto	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-14 09:51:25 -08:00
entry	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-14 09:51:25 -08:00
events	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-14 09:51:25 -08:00
hyperv
ia32
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-17 00:10:42 -05:00
kernel	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-14 09:51:25 -08:00
kvm	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-14 09:51:25 -08:00
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-17 00:10:42 -05:00
math-emu
mm	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-14 09:51:25 -08:00
net	bpf: x64: add JIT support for multi-function programs	2017-12-17 20:34:36 +01:00
oprofile
pci	x86/PCI: Move and shrink AMD 64-bit window to avoid conflict	2018-01-11 12:01:58 -06:00
platform	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-14 09:51:25 -08:00
power	Merge branch 'WIP.x86-pti.entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-12-18 08:59:15 -08:00
purgatory
ras
realmode
tools
um	Merge commit 'upstream-x86-entry' into WIP.x86/mm	2017-12-17 12:58:53 +01:00
video
xen	xen: fixes for 4.15-rc8	2018-01-12 10:00:15 -08:00
.gitignore
Kbuild
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-17 00:10:42 -05:00
Kconfig.cpu
Kconfig.debug	Merge commit 'upstream-x86-entry' into WIP.x86/mm	2017-12-17 12:58:53 +01:00
Makefile	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-14 15:30:02 -08:00
Makefile_32.cpu
Makefile.um