Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

drivers/net/wireless/ath/ath5k/pci.c

drivers/net/wireless/ath/ath5k/sysfs.c

drivers/net/wireless/ath/ath9k/xmit.c

drivers/net/wireless/ath/carl9170/usb.c

drivers/net/wireless/rtlwifi/rtl8192cu/sw.c

drivers/ssb/driver_pcicore.c

net/bluetooth/hci_conn.c

net/bluetooth/hidp/core.c

net/bluetooth/hidp/hidp.h

net/bluetooth/l2cap_core.c

net/mac80211/scan.c

net/mac80211/wpa.c

net/wireless/core.c

net/wireless/core.h

net/wireless/nl80211.c

net/wireless/scan.c