[PATCH] isdn: clean up documentation index

From: Tilman Schmidt
Date: Fri Jun 19 2009 - 14:25:24 EST

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@xxxxxxx>
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.
- general info for FAQ.
- - info for running audio over ISDN.
- - info for using Fax over ISDN.
- - info on the drivers for Siemens Gigaset ISDN adapters.
- - info on the ICN-ISDN-card and its driver.
->>>>>>> 93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX
- info on the HiSax driver which replaces the old teles.
+ - info on driver for IBM ACT-2000 card.
- info for running audio over ISDN.
- info on driver for AVM-B1 ISDN card.
- - info on driver for IBM ACT-2000 card.
- - info on driver for Eicon active cards.
- info on "CONCAP" encapsulation protocol interface used for X.25.
@@ -59,7 +48,3 @@ README.x25
- info for running X.25 over ISDN.
- frequently asked questions about running PPP over ISDN.
- - info on driver for Hypercope active HYSDN cards
- - info on the Modular ISDN subsystem (mISDN).

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/