isdn: Remove left over conflict marker in Docmentation/isdn/00-INDEX
Subsystems (3)
PATCH 1/1 isdn: Remove left over conflict marker in Docmentation/isdn/00-INDEX
In merge:
commit aba7453037c3a90714caae77a622dceaf1173786
Merge: a4fe91e... 93af7ac...
Author: David S. Miller <[email protected]>
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
The following useless line was retained.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX
Delete it and leave 00-INDEX looking reasonable.
--- Documentation/isdn/00-INDEX | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
Documentation/isdn/00-INDEX +0 -1
@@ -22,7 +22,6 @@ 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
Signature · 1 line
1.6.0.6
David Miller
maintainerFrom: [email protected] (Eric W. Biederman)
Date: Fri, 19 Jun 2009 03:27:43 -0700
Quoted 3 lines
Delete it and leave 00-INDEX looking reasonable.
Signed-off-by Eric W. Biederman <[email protected]>
Thanks Eric, but Tilman Schmidt is going to send me a patch to fix this properly.