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

..

oss

ALSA: snd_pcm_oss_period_size: Use round{up,down}_pow_of_two()

2014-12-30 16:41:55 +01:00

seq

ALSA: seq: potential out of bounds in do_control()

2015-02-12 11:07:48 +01:00

compress_offload.c

ALSA: Simplify snd_device_register() variants

2015-02-02 17:01:26 +01:00

control_compat.c

ALSA: control: Use standard printk helpers

2014-02-14 08:14:14 +01:00

control.c

ALSA: control: Add sanity checks for user ctl id name string

2015-03-12 07:36:38 +01:00

ctljack.c

ALSA: hda - Add missing inclusion of linux/export.h

2011-11-16 14:28:33 +01:00

device.c

ALSA: Clean up snd_device_*() codes

2014-02-25 12:12:52 +01:00

hrtimer.c

ALSA: timer: Use standard printk helpers

2014-02-14 08:14:17 +01:00

hwdep_compat.c

…

hwdep.c

ALSA: Simplify snd_device_register() variants

2015-02-02 17:01:26 +01:00

info_oss.c

ALSA: remove the main version information

2012-09-04 11:38:32 +02:00

info.c

ALSA: core: fix buffer overflow in snd_info_get_line()

2014-08-22 07:21:05 +02:00

init.c

ALSA: Add a helper to add a new attribute group to card

2015-02-06 09:56:33 +01:00

isadma.c

ALSA: core: Use standard printk helpers

2014-02-14 08:14:15 +01:00

jack.c

ALSA: jack: Unregister input device at disconnection

2013-11-14 17:22:45 +01:00

Kconfig

ALSA: core: allow SND_DMAENGINE_PCM use from modules

2013-08-15 18:28:42 +01:00

Makefile

ALSA: pcm: Replace PCM hwptr tracking with tracepoints

2014-11-04 14:09:14 +01:00

memalloc.c

ALSA: core: Use standard printk helpers

2014-02-14 08:14:15 +01:00

memory.c

ALSA: Include linux/uaccess.h and linux/bitopts.h instead of asm/*

2015-01-28 17:25:07 +01:00

misc.c

ALSA: Allow pass NULL dev for snd_pci_quirk_lookup()

2014-10-08 12:08:38 +02:00

pcm_compat.c

ALSA: pcm: Zero-clear reserved fields of PCM status ioctl in compat mode

2014-10-28 12:45:53 +01:00

pcm_dmaengine.c

ALSA: pcm_dmaengine: Correct support for 24bits physical sample widths

2014-07-04 18:55:25 +01:00

pcm_lib.c

ASoC: Updates for v3.20

2015-02-05 07:08:35 +01:00

pcm_memory.c

ALSA: Include linux/io.h instead of asm/io.h

2015-01-28 16:49:33 +01:00

pcm_misc.c

ALSA: pcm: Add big-endian DSD sample formats and fix XMOS DSD sample format

2014-11-21 15:13:28 +01:00

pcm_native.c

Merge branch 'iocb' into for-davem

2015-04-09 00:01:38 -04:00

pcm_timer.c

ALSA: pcm: Use standard printk helpers

2014-02-14 08:14:15 +01:00

pcm_trace.h

ALSA: pcm: Replace PCM hwptr tracking with tracepoints

2014-11-04 14:09:14 +01:00

pcm.c

ALSA: Simplify snd_device_register() variants

2015-02-02 17:01:26 +01:00

rawmidi_compat.c

…

rawmidi.c

ALSA: Simplify snd_device_register() variants

2015-02-02 17:01:26 +01:00

rtctimer.c

ALSA: timer: Use standard printk helpers

2014-02-14 08:14:17 +01:00

sgbuf.c

ALSA: core: Deletion of unnecessary checks before two function calls

2014-11-21 20:06:57 +01:00

sound_oss.c

ALSA: Use standard device refcount for card accounting

2014-02-14 08:14:13 +01:00

sound.c

ALSA: Drop snd_get_device() helper

2015-02-02 17:01:38 +01:00

timer_compat.c

ALSA: Kill snd_assert() in sound/core/*

2008-08-13 11:46:35 +02:00

timer.c

Merge branch 'topic/snd-device' into for-next

2015-02-03 17:57:16 +01:00

vmaster.c

ALSA: core: Use standard printk helpers

2014-02-14 08:14:15 +01:00