Daniel Vetter c0c8b9ed1b Merge tag 'drm-for-v4.9' into drm-intel-next-queued ... It's been over two months, git definitely lost it's marbles. Conflicts resolved by picking our version, plus manually checking the diff with the parent in drm-intel-next-queued to make sure git didn't do anything stupid. It did, so I removed 2 occasions where it double-inserted a bit of code. The diff is now just - kernel-doc changes - drm format/name changes - display-info changes so looks all reasonable. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2016-10-12 08:22:25 +02:00
..
aoa	ALSA: aoa-soundbus: Switch to dev_pm_ops	2015-08-05 16:47:47 +02:00
arm	ALSA: arm: Fix empty menuconfig SND_ARM	2016-08-01 16:07:53 +02:00
atmel	ALSA: sound/atmel/ac97c.c: remove unused variable	2015-05-20 06:18:25 +02:00
core	ALSA: rawmidi: Fix possible deadlock with virmidi registration	2016-09-08 10:45:20 +02:00
drivers	ALSA: dummy: Fix a use-after-free at closing	2016-06-24 15:18:32 +02:00
firewire	ALSA: fireworks: accessing to user space outside spinlock	2016-08-31 16:17:15 +02:00
hda	drm/i915/dp: DP audio API changes for MST	2016-09-22 09:01:55 -07:00
i2c	ALSA: ak4114: remove redundant check on err being < 0	2016-07-12 12:28:04 +02:00
isa	ALSA: adlib: Utilize the module_isa_driver macro	2016-06-01 07:35:52 +02:00
mips	ALSA: Remove deprecated AU1X00 AC97 driver	2016-02-08 08:17:15 +01:00
oss	sound: oss: Use kernel_read_file_from_path() for mod_firmware_load()	2016-07-26 10:38:03 +02:00
parisc	ALSA: Include linux/io.h instead of asm/io.h	2015-01-28 16:49:33 +01:00
pci	Merge tag 'drm-for-v4.9' into drm-intel-next-queued	2016-10-12 08:22:25 +02:00
pcmcia	ALSA: vx: Fix missing kerneldoc parameter descriptions	2014-11-11 09:39:10 +01:00
ppc	ALSA: ppc/awacs: shut up maybe-uninitialized warning	2016-07-05 08:35:49 +02:00
sh	ALSA: sh: aica: Remove deprecated create_workqueue	2016-06-07 11:23:33 +02:00
soc	Merge tag 'drm-for-v4.9' into drm-intel-next-queued	2016-10-12 08:22:25 +02:00
sparc	ALSA: Add missing dependency on CONFIG_SND_TIMER	2016-01-27 07:10:38 +01:00
spi	ALSA: at73c213: manage SSC clock	2016-01-20 09:59:27 +01:00
synth	ALSA: emux: constify nrpn_conv_table structures	2016-01-06 10:19:49 +01:00
usb	ALSA: usb-audio: Add sample rate inquiry quirk for B850V3 CP2114	2016-08-29 16:49:18 +02:00
ac97_bus.c	ASoC: Updates for v4.3	2015-08-31 16:25:22 +02:00
Kconfig	ALSA: hda - Make snd_hda_bus_type public	2015-03-23 13:15:51 +01:00
last.c
Makefile	sound: oss: Use kernel_read_file_from_path() for mod_firmware_load()	2016-07-26 10:38:03 +02:00
sound_core.c	sound: fix check for error condition of register_chrdev()	2015-11-07 11:14:30 +01:00