David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net. ixgbe_phy.c was a set of overlapping whitespace changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-14 01:01:12 -05:00
..
function	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-14 01:01:12 -05:00
legacy	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-10-13 11:28:42 +02:00
udc	usb: gadget: udc: core: fix kernel oops with soft-connect	2014-10-23 09:55:43 -05:00
composite.c	usb: gadget: composite: enable BESL support	2014-10-23 09:55:41 -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: gadget: configfs: add reset API at usb_gadget_driver	2014-09-09 09:59:50 -05: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
Kconfig	usb: gadget: f_uvc: convert f_uvc to new function interface	2014-09-09 09:49:16 -05:00
Makefile	usb: gadget: use $(srctree) instead of $(PWD) for includes	2014-08-29 15:53:46 -05: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