David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... udplite conflict is resolved by taking what 'net-next' did which removed the backlog receive method assignment, since it is no longer necessary. Two entries were added to the non-priv ethtool operations switch statement, one in 'net' and one in 'net-next, so simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-11-26 23:42:21 -05:00
..
f_acm.c	usb: gadget: f_acm: Fix configfs attr name	2016-03-04 15:14:50 +02:00
f_ecm.c	usb: gadget: Update usb_assign_descriptors for SuperSpeedPlus	2016-03-04 15:14:23 +02:00
f_eem.c	usb: gadget: prevent potenial null pointer dereference on skb->len	2016-09-06 10:44:03 +03:00
f_fs.c	usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match()	2016-11-18 13:50:37 +02:00
f_hid.c	usb: gadget: f_hid: use alloc_ep_req()	2016-08-25 12:13:20 +03:00
f_loopback.c	usb: gadget: remove variable ret and remove unnecessary if statement	2016-09-09 13:38:37 +03:00
f_mass_storage.c	usb: gadget: Add per-lun inquiry string	2016-08-25 12:13:13 +03:00
f_mass_storage.h	usb: gadget: Add per-lun inquiry string	2016-08-25 12:13:13 +03:00
f_midi.c	usb: gadget: remove useless parameter in alloc_ep_req()	2016-08-25 12:13:19 +03:00
f_ncm.c	usb: gadget: f_ncm: add support for no_skb_reserve	2016-08-31 10:06:03 +03:00
f_obex.c	usb: gadget: Update usb_assign_descriptors for SuperSpeedPlus	2016-03-04 15:14:23 +02:00
f_phonet.c	net: use core MTU range checking in misc drivers	2016-10-20 14:51:10 -04:00
f_printer.c	usb: gadget: composite: let USB functions process ctrl reqs in cfg0	2016-08-25 12:13:17 +03:00
f_rndis.c	usb: gadget: function: f_rndis: socket buffer may be NULL	2016-08-22 10:45:12 +03:00
f_serial.c	usb: gadget: Update usb_assign_descriptors for SuperSpeedPlus	2016-03-04 15:14:23 +02:00
f_sourcesink.c	usb: gadget: remove useless parameter in alloc_ep_req()	2016-08-25 12:13:19 +03:00
f_subset.c	usb: gadget: Update usb_assign_descriptors for SuperSpeedPlus	2016-03-04 15:14:23 +02:00
f_tcm.c	usb: gadget: f_tcm: out of bound access in usbg_drop_tpg	2016-05-31 11:24:30 +03:00
f_uac1.c	usb: gadget: Update usb_assign_descriptors for SuperSpeedPlus	2016-03-04 15:14:23 +02:00
f_uac2.c	usb: gadget: avoid exposing kernel stack	2016-05-31 11:24:30 +03:00
f_uvc.c	usb: gadget: uvc: Add missing call for additional setup data	2016-08-31 10:06:04 +03:00
f_uvc.h
g_zero.h	usb: gadget: define free_ep_req as universal function	2015-12-15 09:12:41 -06:00
Makefile	usb: gadget: f_tcm: convert to new function interface with backward compatibility	2015-12-20 19:40:34 -08:00
ndis.h
rndis.c	usb: gadget: rndis: free response queue during REMOTE_NDIS_RESET_MSG	2016-08-11 15:09:48 +03:00
rndis.h	usb: gadget: rndis: use signed type for a signed value	2015-05-21 16:29:14 -05:00
storage_common.c	usb: gadget: Add per-lun inquiry string	2016-08-25 12:13:13 +03:00
storage_common.h	usb: gadget: Add per-lun inquiry string	2016-08-25 12:13:13 +03:00
tcm.h	usb-gadget/tcm: Conversion to percpu_ida tag pre-allocation	2016-03-10 21:48:14 -08:00
u_ecm.h
u_eem.h
u_ether_configfs.h	usb-gadget/ether: use per-attribute show and store methods	2015-10-13 22:14:18 -07:00
u_ether.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-15 10:54:36 -05:00
u_ether.h	usb: gadget: u_ether: add a flag to avoid skb_reserve() calling	2016-08-31 10:06:03 +03:00
u_fs.h	usb: gadget: ffs: add eventfd notification about ffs events	2015-01-27 09:34:59 -06:00
u_gether.h
u_hid.h
u_midi.h
u_ncm.h
u_phonet.h
u_printer.h	usb: gadget: printer: add configfs support	2015-03-10 15:33:41 -05:00
u_rndis.h	usb: gadget: rndis: remove the limit of available rndis connections	2015-05-07 13:47:17 -05:00
u_serial.c	usb: gadget: Add the gserial port checking in gs_start_tx()	2016-08-22 10:45:13 +03:00
u_serial.h
u_tcm.h	usb: gadget: f_tcm: convert to new function interface with backward compatibility	2015-12-20 19:40:34 -08:00
u_uac1.c	usb: gadget: u_uac1: fix one code style problem	2015-01-15 09:41:48 -06:00
u_uac1.h	usb: gadget: remove gadget_chips.h	2015-08-06 09:35:20 -05:00
u_uac2.h
u_uvc.h	usb: gadget: uvc: configfs support in uvc function	2015-01-12 12:13:26 -06:00
uvc_configfs.c	usb: gadget: uvc: Fix return value in case of error	2016-08-11 15:09:46 +03:00
uvc_configfs.h	usb: gadget: uvc: configfs support in uvc function	2015-01-12 12:13:26 -06:00
uvc_queue.c	[media] vb2: replace void *alloc_ctxs by struct device *alloc_devs	2016-07-08 14:45:07 -03:00
uvc_queue.h	[media] media: videobuf2: Restructure vb2_buffer	2015-10-01 09:04:43 -03:00
uvc_v4l2.c	Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus	2015-04-21 09:44:55 -03:00
uvc_v4l2.h
uvc_video.c	Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus	2015-04-21 09:44:55 -03:00
uvc_video.h
uvc.h	usb: gadget: uvc: remove unused including <linux/version.h>	2015-04-27 15:48:11 -05:00