Merge /spare/repo/netdev-2.6 branch 'ieee80211'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 28 Jun 2005 04:46:58 +0000 (00:46 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 28 Jun 2005 04:46:58 +0000 (00:46 -0400)
commitd011e151bc5d1a581bf35b492a4fde44d30382b9
treea912c745d3093127a767b7456c46c517bdc0baf7
parent30b4d6565e4d57c6d03600c7822411c7cac19638
parent2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
drivers/net/wireless/wavelan_cs.c
drivers/net/wireless/wl3501_cs.c