Stephen Hemminger 07682b88d8 Merge branch 'master' into net-next		2017-10-11 10:47:55 -07:00
..
linux	update uapi headers from 4.14-rc4 net-next	2017-10-11 10:43:38 -07:00
rdma	rdma: move headers to uapi	2017-10-11 10:47:28 -07:00