diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-15 22:13:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-15 22:13:48 -0700 |
| commit | c455ea4f122d21c91fcf4c36c3f0c08535ba3ce8 (patch) | |
| tree | 4eef0a4e28bde9715e06389d229facfb3039b01e /MAINTAINERS | |
| parent | a7f934d4f16144cb9521b62e9b8c9ac0118097da (diff) | |
| parent | 763437a9e7737535b2fc72175ad4974048769be6 (diff) | |
Merge branch 'for-linus' of git://github.com/tiwai/sound
* 'for-linus' of git://github.com/tiwai/sound:
ALSA: pcm - fix race condition in wait_for_avail()
ALSA: HDA: Cirrus - fix "Surround Speaker" volume control name
ALSA: hda - Terminate the recursive connection search properly
ASoC: Fix trivial build regression in Kirkwood I2S
ASoC: Blackfin: bf5xx-ad193x: Fix codec device name
ASoC: Fix reporting of partial jack updates
ASoC: imx: Fix build warning of unused 'card' variable
ASoC: Fix register cache sync register_writable WARN_ONs
ASoC: snd_soc_codec_{readable,writable}_register change default to true
ASoC: soc-dapm: Fix parameter comment for snd_soc_dapm_free
MAINTAINERS: Add some missed Wolfson files
ASoC: MPC5200: replace of_device with platform_device
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7658e1ffd58e..0acf9ab3d287 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7211,6 +7211,9 @@ W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices S: Supported F: Documentation/hwmon/wm83?? F: drivers/leds/leds-wm83*.c +F: drivers/input/misc/wm831x-on.c +F: drivers/input/touchscreen/wm831x-ts.c +F: drivers/input/touchscreen/wm97*.c F: drivers/mfd/wm8*.c F: drivers/power/wm83*.c F: drivers/rtc/rtc-wm83*.c @@ -7220,6 +7223,7 @@ F: drivers/watchdog/wm83*_wdt.c F: include/linux/mfd/wm831x/ F: include/linux/mfd/wm8350/ F: include/linux/mfd/wm8400* +F: include/linux/wm97xx.h F: include/sound/wm????.h F: sound/soc/codecs/wm* |