David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All of the conflicts were cases of overlapping changes. In net/core/devlink.c, we have to make care that the resouce size_params have become a struct member rather than a pointer to such an object. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-03-06 01:20:46 -05:00
..
Kconfig
Makefile
qrtr.c	net: make getname() functions return length rather than use int* parameter	2018-02-12 14:15:04 -05:00
qrtr.h
smd.c	qrtr: add MODULE_ALIAS macro to smd	2018-02-26 15:07:04 -05:00