summaryrefslogtreecommitdiff
path: root/sound/sparc
ModeNameSize
-rw-r--r--Kconfig952logplain
-rw-r--r--Makefile324logplain
-rw-r--r--amd7930.c31118logplain
-rw-r--r--cs4231.c57318logplain
-rw-r--r--dbri.c80147logplain
/th>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/soc/pxa/z2.c')