diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /Documentation/isdn/CREDITS | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
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: | |||
| 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) |