summaryrefslogtreecommitdiff
path: root/sound/usb/hiface
ModeNameSize
-rw-r--r--Makefile85logplain
-rw-r--r--chip.c7520logplain
-rw-r--r--chip.h815logplain
-rw-r--r--pcm.c15254logplain
-rw-r--r--pcm.h776logplain
x/net-next.git/diff/sound/oss/pss.c?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/oss/pss.c')