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
..
f_acm.c	usb: gadget: acm: fix endianness in notifications	2017-03-22 11:20:52 +02:00
f_ecm.c
f_eem.c
f_fs.c	Revert "usb: gadget: f_fs: Fix ExtCompat descriptor validation"	2017-03-06 16:55:04 +02:00
f_hid.c	usb: gadget: f_hid: fix: Don't access hidg->req without spinlock held	2017-03-22 11:21:10 +02:00
f_loopback.c
f_mass_storage.c
f_mass_storage.h
f_midi.c
f_ncm.c	drivers: add explicit interrupt.h includes	2017-03-30 11:05:34 -07:00
f_obex.c
f_phonet.c
f_printer.c
f_rndis.c
f_serial.c
f_sourcesink.c
f_subset.c
f_tcm.c	usb: gadget: Correct usb EP argument for BOT status request	2017-03-30 01:36:50 -07:00
f_uac1.c
f_uac2.c
f_uvc.c	usb: gadget: f_uvc: Sanity check wMaxPacketSize for SuperSpeed	2017-03-22 11:21:09 +02:00
f_uvc.h
g_zero.h
Makefile
ndis.h
rndis.c
rndis.h
storage_common.c
storage_common.h
tcm.h
u_ecm.h
u_eem.h
u_ether.c
u_ether.h
u_ether_configfs.h
u_fs.h
u_gether.h
u_hid.h
u_midi.h
u_ncm.h
u_phonet.h
u_printer.h
u_rndis.h
u_serial.c
u_serial.h
u_tcm.h
u_uac1.c
u_uac1.h
u_uac2.h
u_uvc.h
uvc.h
uvc_configfs.c
uvc_configfs.h
uvc_queue.c
uvc_queue.h
uvc_v4l2.c
uvc_v4l2.h
uvc_video.c
uvc_video.h