aboutsummaryrefslogtreecommitdiff
path: root/sound/sound_core.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-27 09:36:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-27 09:36:33 -0700
commit31390d0fde1ac9cf47002729660ffd7cd2ae1d75 (patch)
tree4188ec73c65a182257e6b46e56e8423ad6cbe3b3 /sound/sound_core.c
parent6634160abfdbac39bd5ebda516b15b078a0f598e (diff)
parent0a9b86381c76e9d33a9b6edb66aef32d7a3306e3 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ASoC: Blackfin: update SPORT0 port selector (v2) ALSA: hda - Restore default pin configs for realtek codecs sound: use a common working email address pci: use pci_ioremap_bar() in sound/
Diffstat (limited to 'sound/sound_core.c')
-rw-r--r--sound/sound_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c
index faef87a9bc3..a75b289a5d7 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -57,7 +57,7 @@ module_exit(cleanup_soundcore);
/*
* OSS sound core handling. Breaks out sound functions to submodules
*
- * Author: Alan Cox <alan.cox@linux.org>
+ * Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
*
* Fixes:
*