David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three trivial overlapping conflicts. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-05-02 22:14:21 -04:00
..
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
sw	IB/rdmavt: Fix frwr memory registration	2019-04-16 07:11:29 -03:00
ulp	net: remove 'fallback' argument from dev->ndo_select_queue()	2019-03-20 11:18:55 -07:00
Kconfig	IB/{core,uverbs}: Move ib_umem_xxx functions from ib_core to ib_uverbs	2019-01-10 17:06:44 -07:00
Makefile	IB/rdmavt: Create module framework and handle driver registration	2016-03-10 20:37:04 -05:00