linux_old1/sound
Al Viro 237dae8890 Merge branch 'iocb' into for-davem
trivial conflict in net/socket.c and non-trivial one in crypto -
that one had evaded aio_complete() removal.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-04-09 00:01:38 -04:00
..
aoa Merge branch 'topic/snd-device' into for-next 2015-02-03 17:57:16 +01:00
arm ALSA: Deletion of checks before the function call "iounmap" 2015-01-04 15:13:45 +01:00
atmel ALSA: sound/atmel/ac97c.c: Add device tree support 2015-01-07 07:56:19 +01:00
core Merge branch 'iocb' into for-davem 2015-04-09 00:01:38 -04:00
drivers ALSA: opl3: small array underflow 2015-03-06 13:04:42 +01:00
firewire ALSA: firewire-lib: leave unit reference counting completely 2015-03-10 15:27:19 +01:00
i2c Merge branch 'topic/ak411x-fix' into for-next 2015-01-28 22:32:10 +01:00
isa ALSA: msnd: add some missing curly braces 2015-03-05 13:02:10 +01:00
mips Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
oss sound updates for 3.20-rc1 2015-02-11 08:51:59 -08:00
parisc ALSA: Include linux/io.h instead of asm/io.h 2015-01-28 16:49:33 +01:00
pci ALSA: hda - Add one more node in the EAPD supporting candidate list 2015-03-26 11:04:30 +01:00
pcmcia ALSA: vx: Fix missing kerneldoc parameter descriptions 2014-11-11 09:39:10 +01:00
ppc ALSA: Include linux/io.h instead of asm/io.h 2015-01-28 16:49:33 +01:00
sh ALSA: Include linux/io.h instead of asm/io.h 2015-01-28 16:49:33 +01:00
soc Merge remote-tracking branches 'asoc/fix/sgtl5000' and 'asoc/fix/sn95031' into asoc-linus 2015-03-16 12:03:17 +00:00
sparc ALSA: Include linux/io.h instead of asm/io.h 2015-01-28 16:49:33 +01:00
spi
synth ALSA: Include linux/uaccess.h and linux/bitopts.h instead of asm/* 2015-01-28 17:25:07 +01:00
usb ALSA: snd-usb: add quirks for Roland UA-22 2015-03-12 10:19:49 +01:00
Kconfig
Makefile
ac97_bus.c
last.c
sound_core.c
sound_firmware.c