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
..
asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -04:00
uapi/asm	kvm: rename KVM_HINTS_DEDICATED to KVM_HINTS_REALTIME	2018-05-17 19:12:13 +02:00