Re: [GIT]: Networking
From: Tilman Schmidt
Date: Thu Jun 18 2009 - 19:48:26 EST
Am 15.06.2009 14:04 schrieb David Miller:
> Documentation/isdn/00-INDEX | 29 +-
It seems something went wrong with the merge. After:
Merge: a4fe91e 93af7ac
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Wed Apr 29 20:30:35 2009 -0700
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
lines 22..28 of Documentation/isdn/00-INDEX now look like this:
- info on the drivers for Siemens Gigaset ISDN adapters.
- info on the ICN-ISDN-card and its driver.
- info on the HiSax driver which replaces the old teles.
Also, some of the entries, such as README.audio and README.icn, are now duplicated.
Can that be repaired, or would you like me to prepare a patch cleaning it up?
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/