From: David Miller <davem@davemloft.net>
To: hauke@hauke-m.de
Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org,
netdev@vger.kernel.org
Subject: Re: pull request: wireless-2.6 2010-04-15
Date: Wed, 28 Apr 2010 14:23:23 -0700 (PDT) [thread overview]
Message-ID: <20100428.142323.91321737.davem@davemloft.net> (raw)
In-Reply-To: <4BD8A6B4.20603@hauke-m.de>
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 28 Apr 2010 23:20:52 +0200
> Hi David,
>
> in your merge in 5c01d5669356e13f0fb468944c1dd4c6a7e978ad you added "int
> i;" into wl1271_main.c which is unused in that function.
>
> This patch fixes the merge problem:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Applied, thanks.
prev parent reply other threads:[~2010-04-28 21:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-15 20:03 pull request: wireless-2.6 2010-04-15 John W. Linville
2010-04-15 21:29 ` David Miller
2010-04-28 21:20 ` Hauke Mehrtens
2010-04-28 21:23 ` David Miller [this message]
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=20100428.142323.91321737.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=hauke@hauke-m.de \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--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).