From: ebiederm@xmission.com (Eric W. Biederman)
To: David Miller <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>
Subject: [PATCH] isdn: Remove left over conflict marker in Docmentation/isdn/00-INDEX
Date: Fri, 19 Jun 2009 03:27:43 -0700 [thread overview]
Message-ID: <m18wjobjs0.fsf@fess.ebiederm.org> (raw)
In merge:
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
The following useless line was retained.
>>>>>>> 93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX
Delete it and leave 00-INDEX looking reasonable.
Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
---
Documentation/isdn/00-INDEX | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/Documentation/isdn/00-INDEX b/Documentation/isdn/00-INDEX
index f6010a5..e6ff335 100644
--- a/Documentation/isdn/00-INDEX
+++ b/Documentation/isdn/00-INDEX
@@ -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
--
1.6.0.6
next reply other threads:[~2009-06-19 10:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-19 10:27 Eric W. Biederman [this message]
2009-06-19 22:59 ` [PATCH] isdn: Remove left over conflict marker in Docmentation/isdn/00-INDEX David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m18wjobjs0.fsf@fess.ebiederm.org \
--to=ebiederm@xmission.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).