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
..
asm	KVM: s390: Fix for master (4.12)	2017-06-08 16:35:18 +02:00
uapi/asm	net: Define SCM_TIMESTAMPING_PKTINFO on all architectures.	2017-05-21 23:13:37 -04:00