tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

isdn: clean up documentation index

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Tilman Schmidt and committed by
David S. Miller 952e57ba 6877f54e

+2 -17
+2 -17
Documentation/isdn/00-INDEX
··· 14 14 - general info on what you need and what to do for Linux ISDN. 15 15 README.FAQ 16 16 - general info for FAQ. 17 - README.audio 18 - - info for running audio over ISDN. 19 - README.fax 20 - - info for using Fax over ISDN. 21 - README.gigaset 22 - - info on the drivers for Siemens Gigaset ISDN adapters. 23 - README.icn 24 - - info on the ICN-ISDN-card and its driver. 25 - >>>>>>> 93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX 26 17 README.HiSax 27 18 - info on the HiSax driver which replaces the old teles. 19 + README.act2000 20 + - info on driver for IBM ACT-2000 card. 28 21 README.audio 29 22 - info for running audio over ISDN. 30 23 README.avmb1 31 24 - info on driver for AVM-B1 ISDN card. 32 - README.act2000 33 - - info on driver for IBM ACT-2000 card. 34 - README.eicon 35 - - info on driver for Eicon active cards. 36 25 README.concap 37 26 - info on "CONCAP" encapsulation protocol interface used for X.25. 38 27 README.diversion ··· 48 59 - info for running X.25 over ISDN. 49 60 syncPPP.FAQ 50 61 - frequently asked questions about running PPP over ISDN. 51 - README.hysdn 52 - - info on driver for Hypercope active HYSDN cards 53 - README.mISDN 54 - - info on the Modular ISDN subsystem (mISDN).