Re: [GIT]: Networking

Tilman Schmidt
2009-06-18T23:48:22Z

Am 15.06.2009 14:04 schrieb David Miller:
> Documentation/isdn/00-INDEX | 29 +-

It seems something went wrong with the merge. After:

commit aba7453037c3a90714caae77a622dceaf1173786
Merge: a4fe91e 93af7ac
Author: David S. Miller <davem@davemloft.net>
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

Conflicts:
Documentation/isdn/00-INDEX
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/rndis_wlan.c
net/mac80211/main.c

lines 22..28 of Documentation/isdn/00-INDEX now look like this:

- 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

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?

Thanks,
Tilman