summaryrefslogtreecommitdiff
path: root/include/uapi/sound/usb_stream.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/uapi/sound/usb_stream.h')
0 files changed, 0 insertions, 0 deletions
mmit/drivers/usb/serial?id=6d04dfc8966019b8b0977b2cb942351f13d2b178'>6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/serial')