David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simply overlapping changes. In the net/ipv4/route.c case the code had simply moved around a little bit and the same fix was made in both 'net' and 'net-next'. In the net/sched/sch_generic.c case a fix in 'net' happened at the same time that a new argument was added to qdisc_hash_add(). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-15 21:16:30 -04:00
..
function	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00
legacy	USB fixes for 4.11-rc2	2017-03-11 00:08:39 -08:00
udc	usb: gadget: udc: remove pointer dereference after free	2017-03-22 11:21:10 +02:00
composite.c	usb: gadget: composite: Fix function used to free memory	2017-01-12 09:58:05 +02:00
config.c	usb: Use (foo *) instead of (foo*).	2016-06-21 11:16:15 +03:00
configfs.c	usb: gadget: configs: plug memory leak	2017-03-06 16:45:57 +02:00
configfs.h
epautoconf.c
functions.c
Kconfig	usb: gadget: uvc: add V4L2 dependency	2016-09-13 09:29:08 +03:00
Makefile
u_f.c	usb: gadget: remove useless parameter in alloc_ep_req()	2016-08-25 12:13:19 +03:00
u_f.h	usb: gadget: remove useless parameter in alloc_ep_req()	2016-08-25 12:13:19 +03:00
u_os_desc.h
usbstring.c