From: "John W. Linville" <linville@tuxdriver•com>
To: jeff@garzik•org
Cc: netdev@vger•kernel.org
Subject: Please pull 'upstream' branch of wireless-2.6
Date: Mon, 22 May 2006 15:19:42 -0400 [thread overview]
Message-ID: <20060522191942.GE13964@tuxdriver.com> (raw)
In-Reply-To: <20060522191759.GD13964@tuxdriver.com>
The following changes since commit 01d654d25d23fb73deb7904ce1c0b3a0f5fc2908:
John W. Linville:
Merge branch 'upstream-fixes' into upstream
are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream
Marcin Juszkiewicz:
hostap: new pcmcia IDs
drivers/net/wireless/hostap/hostap_cs.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 55bed92..db03dc2 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -881,6 +881,12 @@ static struct pcmcia_device_id hostap_cs
PCMCIA_DEVICE_PROD_ID12(
"ZoomAir 11Mbps High", "Rate wireless Networking",
0x273fe3db, 0x32a1eaee),
+ PCMCIA_DEVICE_PROD_ID123(
+ "Pretec", "CompactWLAN Card 802.11b", "2.5",
+ 0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
+ PCMCIA_DEVICE_PROD_ID123(
+ "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",
+ 0xc7b8df9d, 0x1700d087, 0x4b74baa0),
PCMCIA_DEVICE_NULL
};
MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
--
John W. Linville
linville@tuxdriver•com
next prev parent reply other threads:[~2006-05-22 19:19 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-22 19:18 Please pull 'upstream-fixes' branch of wireless-2.6 John W. Linville
2006-05-22 19:19 ` John W. Linville [this message]
2006-05-24 4:35 ` Please pull 'upstream' " Jeff Garzik
2006-05-24 12:42 ` John W. Linville
2006-05-24 4:26 ` Please pull 'upstream-fixes' " Jeff Garzik
2006-05-24 8:52 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2007-05-29 18:30 John W. Linville
2007-05-29 18:31 ` Please pull 'upstream' " John W. Linville
2007-05-30 14:03 ` Jeff Garzik
2007-05-08 17:39 John W. Linville
2007-05-09 22:54 ` Jeff Garzik
2007-05-07 17:51 John W. Linville
[not found] ` <20070507175121.GF5125-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-05-07 21:15 ` Dan Williams
[not found] ` <1178572550.11805.7.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2007-05-07 22:51 ` John W. Linville
2007-05-08 8:49 ` Johannes Berg
2007-05-07 23:09 ` Jeff Garzik
[not found] ` <463FB1A0.3070608-o2qLIJkoznsdnm+yROfE0A@public.gmane.org>
2007-05-07 23:30 ` Michael Wu
2007-05-07 23:38 ` John W. Linville
2007-05-08 17:38 ` John W. Linville
2007-02-02 21:27 Please pull "upstream-fixes" " John W. Linville
2007-02-02 21:28 ` Please pull "upstream" " John W. Linville
2007-02-07 0:06 ` Please pull "upstream-fixes" " Jeff Garzik
[not found] ` <45C917EF.1060307-o2qLIJkoznsdnm+yROfE0A@public.gmane.org>
2007-02-07 21:11 ` Please pull "upstream" " John W. Linville
[not found] ` <20070207211117.GC6109-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-02-09 20:13 ` John W. Linville
[not found] ` <20070209201306.GA2580-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-02-09 21:12 ` Jeff Garzik
2007-01-18 15:48 Please pull 'upstream-fixes' " John W. Linville
2007-01-18 15:49 ` Please pull 'upstream' " John W. Linville
2007-01-19 3:10 ` Jeff Garzik
2007-01-19 8:42 ` John W. Linville
2007-01-23 5:36 ` Jeff Garzik
2007-01-03 2:41 Please pull 'upstream-fixes' " John W. Linville
2007-01-03 2:42 ` Please pull 'upstream' " John W. Linville
2007-01-18 12:16 ` John W. Linville
2006-12-21 3:03 Please pull 'upstream-fixes' " John W. Linville
2006-12-21 3:05 ` Please pull 'upstream' " John W. Linville
2006-12-26 21:39 ` Jeff Garzik
2006-12-28 0:10 ` John W. Linville
2007-01-03 2:04 ` John W. Linville
2006-12-12 0:21 John W. Linville
2006-12-06 1:42 John W. Linville
2006-12-07 10:03 ` Jeff Garzik
2006-11-15 1:29 Please pull 'upstream-fixes' " John W. Linville
2006-11-15 1:31 ` Please pull 'upstream' " John W. Linville
2006-11-28 19:13 ` John W. Linville
2006-11-08 4:58 Please pull 'upstream-fixes' " John W. Linville
2006-11-08 4:59 ` Please pull 'upstream' " John W. Linville
2006-11-08 19:48 ` John W. Linville
2006-11-14 15:29 ` Jeff Garzik
2006-10-17 21:34 Please pull 'upstream-fixes' " John W. Linville
2006-10-17 21:35 ` Please pull 'upstream' " John W. Linville
2006-10-21 18:22 ` Jeff Garzik
2006-09-11 23:58 Please pull 'upstream-fixes' " John W. Linville
2006-09-11 23:59 ` Please pull 'upstream' " John W. Linville
2006-09-12 15:43 ` Jeff Garzik
2006-09-12 19:49 ` Michael Buesch
2006-08-30 15:05 John W. Linville
2006-09-06 15:02 ` Jeff Garzik
2006-08-14 20:50 John W. Linville
2006-07-28 0:22 Please pull 'upstream-fixes' " John W. Linville
2006-07-28 0:23 ` Please pull 'upstream' " John W. Linville
2006-07-29 4:33 ` Jeff Garzik
2006-07-10 21:29 Please pull 'upstream-fixes' " John W. Linville
2006-07-10 21:31 ` Please pull 'upstream' " John W. Linville
2006-07-10 21:38 ` Michael Buesch
2006-07-10 21:58 ` Larry Finger
2006-07-19 17:51 ` Jeff Garzik
2006-06-26 21:25 John W. Linville
2006-06-27 2:06 ` Jeff Garzik
2006-06-27 2:27 ` Larry Finger
2006-06-27 3:50 ` Jeff Garzik
2006-06-27 13:30 ` Michael Buesch
2006-06-27 14:11 ` Jeff Garzik
2006-06-27 14:34 ` Larry Finger
2006-06-27 14:36 ` Michael Buesch
2006-06-27 16:10 ` Jeff Garzik
2006-06-27 16:23 ` Michael Buesch
2006-06-27 15:25 ` Michael Buesch
2006-06-27 16:12 ` Jeff Garzik
2006-06-27 16:31 ` Michael Buesch
2006-06-27 19:33 ` John W. Linville
2006-06-27 19:47 ` Michael Buesch
2006-06-27 20:06 ` Larry Finger
2006-06-27 20:23 ` Michael Buesch
2006-06-27 20:37 ` Larry Finger
2006-06-28 14:34 ` Michael Buesch
2006-06-28 16:04 ` Larry Finger
2006-06-28 16:32 ` Michael Buesch
2006-06-28 17:32 ` Larry Finger
2006-06-28 18:02 ` Michael Buesch
2006-06-27 16:52 ` Joseph Jezak
2006-06-15 20:03 John W. Linville
2006-06-20 8:46 ` Jeff Garzik
2006-06-05 21:53 Please pull 'upstream-fixes' " John W. Linville
2006-06-05 21:55 ` Please pull 'upstream' " John W. Linville
2006-06-08 19:48 ` Jeff Garzik
2006-05-17 19:34 Please pull 'upstream-fixes' " John W. Linville
2006-05-17 19:38 ` Please pull 'upstream' " John W. Linville
2006-05-17 21:23 ` Daniel Drake
2006-05-18 17:28 ` John W. Linville
2006-05-18 18:26 ` Daniel Drake
2006-05-06 1:06 Please pull upstream-fixes " John W. Linville
2006-05-06 1:09 ` Please pull upstream " John W. Linville
2006-04-24 19:40 Please pull 'upstream-fixes' " John W. Linville
2006-04-24 20:40 ` Please pull 'upstream' " John W. Linville
2006-04-25 0:33 ` Dan Williams
2006-04-25 11:30 ` Johannes Berg
2006-04-25 12:03 ` Dan Williams
2006-04-26 10:18 ` Jeff Garzik
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=20060522191942.GE13964@tuxdriver.com \
--to=linville@tuxdriver$(echo .)com \
--cc=jeff@garzik$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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