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
configfs.c	usb: gadget: configfs: add reset API at usb_gadget_driver	2014-09-09 09:59:50 -05:00
configfs.h
epautoconf.c
functions.c
Kconfig	usb: gadget: f_uvc: convert f_uvc to new function interface	2014-09-09 09:49:16 -05:00
Makefile
u_f.c
u_f.h
u_os_desc.h
usbstring.c