summaryrefslogtreecommitdiffstats
path: root/Documentation/isdn/CREDITS
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-10-31 08:18:02 +0100
committerPaul Mundt <lethal@linux-sh.org>2008-10-31 08:18:02 +0100
commit0803d540db06f53acd2fabf1347d5b665218f14a (patch)
treef5f8e5510a76bb59d3583478961daf5afc32df08 /Documentation/isdn/CREDITS
parentsh: Fix up the shared IRQ demuxer's control bit testing logic. (diff)
parentMerge branch 'for-linus' of git://neil.brown.name/md (diff)
downloadlinux-0803d540db06f53acd2fabf1347d5b665218f14a.tar.xz
linux-0803d540db06f53acd2fabf1347d5b665218f14a.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Documentation/isdn/CREDITS')
-rw-r--r--Documentation/isdn/CREDITS2
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)