kernel_optimize_test/net/caif
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 netns: make struct pernet_operations::id unsigned int 2016-11-18 10:59:15 -05:00
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 caif_usb: use target structure member in memset 2014-10-14 16:05:45 -04:00
cfcnfg.c net caif: insert missing spaces in pr_* messages and unbreak multi-line strings 2016-10-28 13:47:33 -04:00
cfctrl.c
cfdbgl.c
cfdgml.c
cffrml.c caif: fix a signedness bug in cfpkt_iterate() 2015-02-20 17:35:14 -05:00
cfmuxl.c caif: replace kmalloc/memset 0 by kzalloc 2014-10-14 16:04:07 -04:00
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 net: caif: fix erroneous return value 2016-02-18 14:59:35 -05:00
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