David S. Miller 8565d26bcb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The BPF verifier conflict was some minor contextual issue. The TUN conflict was less trivial. Cong Wang fixed a memory leak of tfile->tx_array in 'net'. This is an skb_array. But meanwhile in net-next tun changed tfile->tx_arry into tfile->tx_ring which is a ptr_ring. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-01-19 22:59:33 -05:00
..
Makefile	can: peak_usb: add support for PEAK new CANFD USB adapters	2015-01-28 14:47:06 +01:00
pcan_usb.c	can: peak_usb: remove some 'struct timeval' users	2017-12-01 09:14:22 +01:00
pcan_usb_core.c	can: peak_usb: peak_usb_netif_rx(): remove unused parameter "u32 ts_high"	2018-01-05 11:12:08 +01:00
pcan_usb_core.h	can: peak_usb: peak_usb_netif_rx(): remove unused parameter "u32 ts_high"	2018-01-05 11:12:08 +01:00
pcan_usb_fd.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-19 22:59:33 -05:00
pcan_usb_pro.c	can: peak_usb: remove some 'struct timeval' users	2017-12-01 09:14:22 +01:00
pcan_usb_pro.h	can: peak_usb: export pcan_usb_pro functions	2015-01-28 14:47:06 +01:00