Merge git://git.tuxdriver.com/git/netdev-jwl
commit3133c5e896c0b2509e72ae0c2cb9452c80d47f46
authorJeff Garzik <jgarzik@pobox.com>
Tue, 8 Nov 2005 03:54:48 +0000 (7 22:54 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 8 Nov 2005 03:54:48 +0000 (7 22:54 -0500)
treeae8af7e85d0a7c402cca7d31eac2935897e1d698
parent6b995751c2e851d2bc9c277b5884d0adb519e31d
parentb69a3aa85cb7bda2eb6c5932a62c1337d0d6612c
Merge git://git.tuxdriver.com/git/netdev-jwl
drivers/net/s2io.c
drivers/net/wireless/airo.c
drivers/net/wireless/airo_cs.c
drivers/net/wireless/prism54/islpci_eth.c
net/ieee80211/ieee80211_rx.c