Merge git://git.tuxdriver.com/git/netdev-jwl

diff --cc drivers/net/s2io.c
Simple merge

diff --cc drivers/net/wireless/airo.c
Simple merge

diff --cc drivers/net/wireless/airo_cs.c
Simple merge

diff --cc drivers/net/wireless/prism54/islpci_eth.c
Simple merge

diff --cc net/ieee80211/ieee80211_rx.c
Simple merge