diff options
author | Takashi Iwai | 2008-12-01 18:02:17 +0100 |
---|---|---|
committer | Takashi Iwai | 2008-12-01 18:02:17 +0100 |
commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
tree | 214348d40ed547a72f9612a7e5c94a01afded812 /Documentation/isdn/CREDITS | |
parent | ALSA: soc - Remove obsoleted sound/driver.h inclusion (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
download | kernel-qcow2-linux-3af4182cc5be7d5505f9801ee3297373f1872446.tar.gz kernel-qcow2-linux-3af4182cc5be7d5505f9801ee3297373f1872446.tar.xz kernel-qcow2-linux-3af4182cc5be7d5505f9801ee3297373f1872446.zip |
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'Documentation/isdn/CREDITS')
-rw-r--r-- | Documentation/isdn/CREDITS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/isdn/CREDITS b/Documentation/isdn/CREDITS index 8cac6c2f23ee..c1679e913fca 100644 --- a/Documentation/isdn/CREDITS +++ b/Documentation/isdn/CREDITS @@ -5,7 +5,7 @@ I want to thank all who contributed to this project and especially to: Thomas Bogendörfer (tsbogend@bigbug.franken.de) Tester, lots of bugfixes and hints. -Alan Cox (alan@redhat.com) +Alan Cox (alan@lxorguk.ukuu.org.uk) For help getting into standard-kernel. Henner Eisen (eis@baty.hanse.de) |