diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-29 20:30:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-29 20:30:35 -0700 |
| commit | aba7453037c3a90714caae77a622dceaf1173786 (patch) | |
| tree | bf07f9f432b0d8e9db9486f1f32ad065c0aa7c5c /Documentation/isdn/00-INDEX | |
| parent | a4fe91ee711f4e955ea85ab05b092cfe384b073e (diff) | |
| parent | 93af7aca44f0e82e67bda10a0fb73d383edcc8bd (diff) | |
| download | op-kernel-dev-aba7453037c3a90714caae77a622dceaf1173786.zip op-kernel-dev-aba7453037c3a90714caae77a622dceaf1173786.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/isdn/00-INDEX
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/rndis_wlan.c
net/mac80211/main.c
Diffstat (limited to 'Documentation/isdn/00-INDEX')
| -rw-r--r-- | Documentation/isdn/00-INDEX | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/Documentation/isdn/00-INDEX b/Documentation/isdn/00-INDEX index 33543ac..f6010a5 100644 --- a/Documentation/isdn/00-INDEX +++ b/Documentation/isdn/00-INDEX @@ -8,10 +8,21 @@ INTERFACE - description of isdn4linux Link Level and Hardware Level interfaces. INTERFACE.fax - description of the fax subinterface of isdn4linux. +INTERFACE.CAPI + - description of kernel CAPI Link Level to Hardware Level interface. 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.audio @@ -45,6 +56,10 @@ README.sc README.syncppp - info on running Sync PPP over ISDN. README.x25 - - info on running X.25 over ISDN. + - 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). |
