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
..
function	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-26 23:42:21 -05:00
legacy	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-10 20:16:43 -07:00
udc	usb: gadget: udc: atmel: fix endpoint name	2016-10-17 11:13:21 +03:00
composite.c	usb: gadget: composite: let USB functions process ctrl reqs in cfg0	2016-08-25 12:13:17 +03:00
config.c	usb: Use (foo *) instead of (foo*).	2016-06-21 11:16:15 +03:00
configfs.c	usb: gadget: configfs: log function unbinding as debug	2016-08-31 10:06:05 +03:00
configfs.h	usb: gadget: OS descriptors: provide interface directory names	2014-06-19 10:06:48 -05:00
epautoconf.c	usb: gadget: epautoconf: add usb_ep_autoconfig_release() function	2015-09-27 10:54:31 -05:00
functions.c
Kconfig	usb: gadget: uvc: add V4L2 dependency	2016-09-13 09:29:08 +03:00
Makefile	usb: gadget: use $(srctree) instead of $(PWD) for includes	2014-08-29 15:53:46 -05:00
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	usb: gadget: u_os_desc: helper functions for accessing ext prop buffer	2014-07-10 08:36:51 -05:00
usbstring.c	usb: delete non-required instances of include <linux/init.h>	2014-01-08 15:01:39 -08:00