* [PATCH] isdn: clean up documentation index
@ 2009-06-19 18:24 Tilman Schmidt
2009-06-20 8:10 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Tilman Schmidt @ 2009-06-19 18:24 UTC (permalink / raw)
To: David Miller; +Cc: Netdev, LKML, Karsten Keil, isdn4linux
Remove duplicates, a stray merge conflict marker, and an entry for a file
which doesn't exist, and move one entry to its correct alphabetical place.
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
---
Documentation/isdn/00-INDEX | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/Documentation/isdn/00-INDEX b/Documentation/isdn/00-INDEX
index f6010a5..e87e336 100644
--- a/Documentation/isdn/00-INDEX
+++ b/Documentation/isdn/00-INDEX
@@ -14,25 +14,14 @@ README
- general info on what you need and what to do for Linux ISDN.
README.FAQ
- general info for FAQ.
-README.audio
- - info for running audio over ISDN.
-README.fax
- - info for using Fax over ISDN.
-README.gigaset
- - info on the drivers for Siemens Gigaset ISDN adapters.
-README.icn
- - info on the ICN-ISDN-card and its driver.
->>>>>>> 93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX
README.HiSax
- info on the HiSax driver which replaces the old teles.
+README.act2000
+ - info on driver for IBM ACT-2000 card.
README.audio
- info for running audio over ISDN.
README.avmb1
- info on driver for AVM-B1 ISDN card.
-README.act2000
- - info on driver for IBM ACT-2000 card.
-README.eicon
- - info on driver for Eicon active cards.
README.concap
- info on "CONCAP" encapsulation protocol interface used for X.25.
README.diversion
@@ -59,7 +48,3 @@ README.x25
- info for running X.25 over ISDN.
syncPPP.FAQ
- frequently asked questions about running PPP over ISDN.
-README.hysdn
- - info on driver for Hypercope active HYSDN cards
-README.mISDN
- - info on the Modular ISDN subsystem (mISDN).
--
1.6.2.1.214.ge986c
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] isdn: clean up documentation index
2009-06-19 18:24 [PATCH] isdn: clean up documentation index Tilman Schmidt
@ 2009-06-20 8:10 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-06-20 8:10 UTC (permalink / raw)
To: tilman; +Cc: netdev, linux-kernel, karsten-keil, isdn4linux
From: Tilman Schmidt <tilman@imap.cc>
Date: Fri, 19 Jun 2009 20:24:53 +0200 (CEST)
> Remove duplicates, a stray merge conflict marker, and an entry for a file
> which doesn't exist, and move one entry to its correct alphabetical place.
>
> Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-20 8:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-19 18:24 [PATCH] isdn: clean up documentation index Tilman Schmidt
2009-06-20 8:10 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.