Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/wireless-2.6

drivers/net/ps3_gelic_wireless.c

drivers/net/wireless/airo.c

drivers/net/wireless/atmel.c

drivers/net/wireless/hostap/hostap.h

drivers/net/wireless/hostap/hostap_ap.c

drivers/net/wireless/hostap/hostap_ioctl.c

drivers/net/wireless/libertas/scan.c

drivers/net/wireless/orinoco.c

drivers/net/wireless/prism54/isl_ioctl.c

drivers/net/wireless/rndis_wlan.c

drivers/net/wireless/wl3501_cs.c

drivers/net/wireless/zd1201.c

fs/compat_ioctl.c

include/linux/wireless.h

include/net/iw_handler.h

include/net/wext.h

net/ieee80211/ieee80211_wx.c

net/mac80211/ieee80211_i.h

net/mac80211/mlme.c

net/mac80211/wext.c