David S. Miller c0b458a946 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c, we had some overlapping changes: 1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE --> MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE 2) In 'net-next' params->log_rq_size is renamed to be params->log_rq_mtu_frames. 3) In 'net-next' params->hard_mtu is added. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-04-01 19:49:34 -04:00
..
ac97	ALSA: ac97: kconfig: Remove select of undefined symbol AC97	2018-02-12 08:16:39 +01:00
aoa	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
arm	Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ac97-mfd', 'asoc/topic/amd' and 'asoc/topic/arizona-mfd' into asoc-next	2017-11-10 21:31:02 +00:00
atmel	ASoC: Updates for v4.14	2017-09-04 14:50:49 +02:00
core	ALSA: pcm: potential uninitialized return values	2018-03-27 15:20:19 +02:00
drivers	ALSA: aloop: Fix access to not-yet-ready substream via cable	2018-03-22 10:40:27 +01:00
firewire	treewide: remove large struct-pass-by-value from tracepoint arguments	2018-03-28 22:55:18 +02:00
hda	Merge branch 'topic/hdac-hdmi' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel	2018-01-12 21:19:05 +00:00
i2c	ASoC: Updates for v4.15	2017-11-13 15:45:57 +01:00
isa	ALSA: gus: Delete an error message for a failed memory allocation in snd_gf1_dma_transfer_block()	2017-11-29 09:29:36 +01:00
mips	ALSA: sgio2audio: Improve a size determination in snd_sgio2audio_create()	2017-11-29 09:29:31 +01:00
oss	vfs: do bulk POLL* -> EPOLL* replacement	2018-02-11 14:34:03 -08:00
parisc	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
pci	ALSA: hda/realtek - Fix speaker no sound after system resume	2018-03-22 09:43:28 +01:00
pcmcia	ALSA: pcmcia: constify snd_pcm_ops structures	2017-08-19 11:02:21 +02:00
ppc	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
sh	ALSA: sh: aica: Convert timers to use timer_setup()	2017-10-05 08:20:17 +02:00
soc	Merge remote-tracking branches 'asoc/fix/amd', 'asoc/fix/hdmi-codec', 'asoc/fix/rt5651', 'asoc/fix/samsung', 'asoc/fix/sgtl5000', 'asoc/fix/sunxi' and 'asoc/fix/wm-adsp' into asoc-linus	2018-03-12 09:14:07 -07:00
sparc	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
spi	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
synth	ASoC: Updates for v4.15	2017-11-13 15:45:57 +01:00
usb	ALSA: usb-audio: Add native DSD support for TEAC UD-301	2018-03-23 21:59:12 +01:00
x86	ALSA: x86: Fix potential crash at error path	2018-02-28 08:46:00 +01:00
ac97_bus.c
Kconfig	ASoC: Updates for v4.15	2017-11-13 15:45:57 +01:00
last.c
Makefile	ASoC: Updates for v4.15	2017-11-13 15:45:57 +01:00
sound_core.c	sound: Remove leftover msnd init declarations	2018-01-11 17:10:34 +01:00