diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-01 09:56:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-01 09:56:26 +0200 |
| commit | 087021ba41e9481202103d51d3dd0c4706899a2b (patch) | |
| tree | bf5d67420fd176682a1f8f1e9342ad397c23937a /Documentation/isdn/00-INDEX | |
| parent | fb9c818873a788c5c01c9868cc6050df96e2c7df (diff) | |
| parent | e83c2b0ff325f52dda1aff3572d0e1516216c54b (diff) | |
Merge branch 'linus' into perfcounters/urgent
Merge reason: this branch was on a .30-ish base before, update
it to an almost-.31-rc2 upstream base to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/isdn/00-INDEX')
| -rw-r--r-- | 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 f6010a53659..e87e336f590 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). |