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
..
caif_dev.c
caif_socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
caif_usb.c
cfcnfg.c
cfctrl.c
cfdbgl.c
cfdgml.c
cffrml.c
cfmuxl.c
cfpkt_skbuff.c	net: caif: Fix a sleep-in-atomic bug in cfpkt_create_pfx	2017-06-10 18:19:45 -04:00
cfrfml.c
cfserl.c
cfsrvl.c
cfutill.c
cfveil.c
cfvidl.c
chnl_net.c	net: Fix inconsistent teardown and release of private netdev state.	2017-06-07 15:53:24 -04:00
Kconfig
Makefile