diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
| commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
| tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /Documentation/isdn | |
| parent | a8884e3415c29c58a5875d54c109c4a7fcaa6fb4 (diff) | |
| parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Documentation/isdn')
| -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: | |||
| 5 | Thomas Bogendörfer (tsbogend@bigbug.franken.de) | 5 | Thomas Bogendörfer (tsbogend@bigbug.franken.de) |
| 6 | Tester, lots of bugfixes and hints. | 6 | Tester, lots of bugfixes and hints. |
| 7 | 7 | ||
| 8 | Alan Cox (alan@redhat.com) | 8 | Alan Cox (alan@lxorguk.ukuu.org.uk) |
| 9 | For help getting into standard-kernel. | 9 | For help getting into standard-kernel. |
| 10 | 10 | ||
| 11 | Henner Eisen (eis@baty.hanse.de) | 11 | Henner Eisen (eis@baty.hanse.de) |