Merge branches 'topic/fix/asoc', 'topic/fix/hda', 'topic/fix/misc' and 'topic/pci-ioremap-bar' into for-linus

2008-10-27 17:08:11 +01:00
parent bfd4e66b8d c3e5203bed e044c39ae2 2f1e593d42 2f5ad54ea6
commit 0a9b86381c
1054 changed files with 46962 additions and 21000 deletions
--- 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:
 *