diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 19:22:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 19:22:50 -0700 |
| commit | e8650a08232e75274304b812ff04cfce9af9671c (patch) | |
| tree | 0609c942e6ca99016e788ff2ee2bbed1bb9215a4 /sound | |
| parent | 3c2c4b73aa79e4a1b601710b59e092441175f4bb (diff) | |
| parent | f70d4a95edc7da87f39cd8b603ba131df2c198ed (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial updates from Jiri Kosina:
"As usual, it's mostly typo fixes, redundant code elimination and some
documentation updates."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
edac, mips: don't change code that has been removed in edac/mips tree
xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
lib: Change mail address of Oskar Schirmer
net: Change mail address of Oskar Schirmer
arm/m68k: Change mail address of Sebastian Hess
i2c: Change mail address of Oskar Schirmer
net: Fix tcp_build_and_update_options comment in struct tcp_sock
atomic64_32.h: fix parameter naming mismatch
Kconfig: replace "--- help ---" with "---help---"
c2port: fix bogus Kconfig "default no"
edac: Fix spelling errors.
qla1280: Remove redundant NULL check before release_firmware() call
remoteproc: remove redundant NULL check before release_firmware()
qla2xxx: Remove redundant NULL check before release_firmware() call.
aic94xx: Get rid of redundant NULL check before release_firmware() call
tehuti: delete redundant NULL check before release_firmware()
qlogic: get rid of a redundant test for NULL before call to release_firmware()
bna: remove redundant NULL test before release_firmware()
tg3: remove redundant NULL test before release_firmware() call
typhoon: get rid of redundant conditional before all to release_firmware()
...
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/isa/als100.c | 2 | ||||
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 2 | ||||
| -rw-r--r-- | sound/soc/imx/Kconfig | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/als100.c b/sound/isa/als100.c index d1f4351fb6ee..2d67c78c9f4b 100644 --- a/sound/isa/als100.c +++ b/sound/isa/als100.c @@ -7,7 +7,7 @@ Thanks to Pierfrancesco 'qM2' Passerini. Generalised for soundcards based on DT-0196 and ALS-007 chips - by Jonathan Woithe <jwoithe@physics.adelaide.edu.au>: June 2002. + by Jonathan Woithe <jwoithe@just42.net>: June 2002. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7810913d07a0..708d47c294ee 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6,7 +6,7 @@ * Copyright (c) 2004 Kailang Yang <kailang@realtek.com.tw> * PeiSen Hou <pshou@realtek.com.tw> * Takashi Iwai <tiwai@suse.de> - * Jonathan Woithe <jwoithe@physics.adelaide.edu.au> + * Jonathan Woithe <jwoithe@just42.net> * * This driver is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index 810acaa09009..d83e5d0b5d52 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig @@ -28,7 +28,7 @@ config SND_SOC_IMX_AUDMUX tristate config SND_MXC_SOC_WM1133_EV1 - tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted" + tristate "Audio on the i.MX31ADS with WM1133-EV1 fitted" depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL select SND_SOC_WM8350 select SND_MXC_SOC_FIQ |