Thomas Gleixner 303c146df1 Merge branch 'timers/urgent' into timers/core ... Pick up urgent bug fix and resolve the conflict. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2018-01-27 15:35:29 +01:00
..
mpu401	ALSA: drivers: Convert timers to use timer_setup()	2017-10-24 21:01:16 +02:00
opl3	ASoC: Updates for v4.15	2017-11-13 15:45:57 +01:00
opl4	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
pcsp	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
vx	ALSA: vx: Put missing KERN_CONT prefix	2017-08-31 11:01:17 +02:00
aloop.c	ALSA: aloop: Fix racy hw constraints adjustment	2018-01-05 16:44:16 +01:00
dummy.c	ALSA/dummy: Replace tasklet with softirq hrtimer	2018-01-16 09:51:22 +01:00
Kconfig	ALSA: seq: Allow the modular sequencer registration	2017-06-12 08:43:33 +02:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
ml403-ac97cr.c	ALSA: drivers: constify snd_pcm_ops structures	2017-08-19 11:02:15 +02:00
mtpav.c	ALSA: drivers: Convert timers to use timer_setup()	2017-10-24 21:01:16 +02:00
mts64.c	ALSA: drivers: Constify snd_rawmidi_ops	2017-01-12 12:50:06 +01:00
pcm-indirect2.c	treewide: Fix typos in printk	2015-12-08 14:59:19 +01:00
pcm-indirect2.h
portman2x4.c	ALSA: drivers: Constify snd_rawmidi_ops	2017-01-12 12:50:06 +01:00
serial-u16550.c	ALSA: drivers: Convert timers to use timer_setup()	2017-10-24 21:01:16 +02:00
virmidi.c	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00