diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:54:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:54:17 -0400 |
| commit | 9a9136e270af14da506f66bcafcc506b86a86498 (patch) | |
| tree | b4d0a6877d92635134b7a944d0032fbc43227fd2 /Documentation/isdn/README.icn | |
| parent | 3960208f9ca0cf6bdb31c21c59ac0526303f8b34 (diff) | |
| parent | 7bb2acb76e8168ca5d0bde5a5a56585a11b3525a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
sound: convert "sound" subdirectory to UTF-8
MAINTAINERS: Add cxacru website/mailing list
include files: convert "include" subdirectory to UTF-8
general: convert "kernel" subdirectory to UTF-8
documentation: convert the Documentation directory to UTF-8
Convert the toplevel files CREDITS and MAINTAINERS to UTF-8.
remove broken URLs from net drivers' output
Magic number prefix consistency change to Documentation/magic-number.txt
trivial: s/i_sem /i_mutex/
fix file specification in comments
drivers/base/platform.c: fix small typo in doc
misc doc and kconfig typos
Remove obsolete fat_cvf help text
Fix occurrences of "the the "
Fix minor typoes in kernel/module.c
Kconfig: Remove reference to external mqueue library
Kconfig: A couple of grammatical fixes in arch/i386/Kconfig
Correct comments in genrtc.c to refer to correct /proc file.
Fix more "deprecated" spellos.
Fix "deprecated" typoes.
...
Fix trivial comment conflict in kernel/relay.c.
Diffstat (limited to 'Documentation/isdn/README.icn')
| -rw-r--r-- | Documentation/isdn/README.icn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/isdn/README.icn b/Documentation/isdn/README.icn index a5f55eadb3ca..13f833d4e910 100644 --- a/Documentation/isdn/README.icn +++ b/Documentation/isdn/README.icn | |||
| @@ -3,8 +3,8 @@ $Id: README.icn,v 1.7 2000/08/06 09:22:51 armin Exp $ | |||
| 3 | You can get the ICN-ISDN-card from: | 3 | You can get the ICN-ISDN-card from: |
| 4 | 4 | ||
| 5 | Thinking Objects Software GmbH | 5 | Thinking Objects Software GmbH |
| 6 | Versbacher Röthe 159 | 6 | Versbacher Röthe 159 |
| 7 | 97078 Würzburg | 7 | 97078 Würzburg |
| 8 | Tel: +49 931 2877950 | 8 | Tel: +49 931 2877950 |
| 9 | Fax: +49 931 2877951 | 9 | Fax: +49 931 2877951 |
| 10 | 10 | ||