David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
function	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-09-23 12:09:27 -04:00
legacy	usb: gadget: remove $(PWD) in ccflags-y	2014-08-20 11:16:02 -05:00
udc	usb: gadget: fusb300_udc.h: Fix typo in include guard	2014-09-03 09:15:57 -05:00
Kconfig	usb: gadget: Gadget directory cleanup - group UDC drivers	2014-07-16 12:15:28 -05:00
Makefile	usb: gadget: remove $(PWD) in ccflags-y	2014-08-20 11:16:02 -05:00
composite.c	usb: gadget: composite: dequeue cdev->req before free it in composite_dev_cleanup	2014-07-16 10:05:01 -05:00
config.c	usb: gadget: always update HS/SS descriptors and create a copy of them	2012-10-31 15:09:44 +02:00
configfs.c	usb: patches for v3.17 merge window	2014-07-21 11:33:41 -07:00
configfs.h	usb: gadget: OS descriptors: provide interface directory names	2014-06-19 10:06:48 -05:00
epautoconf.c	usb: delete non-required instances of include <linux/init.h>	2014-01-08 15:01:39 -08:00
functions.c	usb: gadget: add a forward pointer from usb_function to its "instance"	2013-01-21 20:52:46 +02:00
u_f.c	usb: gadget: only GPL drivers in the gadget and phy framework	2014-04-21 14:07:12 -05:00
u_f.h	usb: gadget: FunctionFS: share VLA macros with all usb gadget files	2014-05-14 09:37:27 -05: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