diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-09-30 10:24:05 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-30 10:24:05 +0200 |
| commit | 5498380e4f403c0938801e2cd6683353d0029cac (patch) | |
| tree | c65ab75034cac68e45da4d5bbb1513728bacec84 /MAINTAINERS | |
| parent | e76bf634870e3c5e3a767ad575f1d404c9f1cab8 (diff) | |
| parent | 82b925c405444b760e743b55a9ad498cb3551afe (diff) | |
| download | lwn-5498380e4f403c0938801e2cd6683353d0029cac.tar.gz lwn-5498380e4f403c0938801e2cd6683353d0029cac.zip | |
Merge tag 'asoc-v3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17
A few small driver specific fixes and a couple of error handling fixes
in the core.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 809ecd680d88..33363e9db610 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1665,6 +1665,12 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com> S: Supported F: drivers/tty/serial/atmel_serial.c +ATMEL Audio ALSA driver +M: Bo Shen <voice.shen@atmel.com> +L: alsa-devel@alsa-project.org (moderated for non-subscribers) +S: Supported +F: sound/soc/atmel + ATMEL DMA DRIVER M: Nicolas Ferre <nicolas.ferre@atmel.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -6876,7 +6882,7 @@ F: arch/x86/kernel/quirks.c PCI DRIVER FOR IMX6 M: Richard Zhu <r65037@freescale.com> -M: Shawn Guo <shawn.guo@freescale.com> +M: Lucas Stach <l.stach@pengutronix.de> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained |