Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Jul 2011 18:46:59 +0000 (14:46 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Jul 2011 18:46:59 +0000 (14:46 -0400)
commitd8598981146241064993e371cea8333f59553cb6
treebb92a46fb9fe75ee9c4fdbbe0a5b6eafc6818ef3
parent8ae2e12f1534e647d4a816755e5a09c2de6f9fca
parent34459512ffa7236c849466e3bd604801389734e1
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/ath/ath5k/sysfs.c
net/bluetooth/l2cap_core.c
net/mac80211/wpa.c
drivers/net/wireless/ath/ath5k/eeprom.c
drivers/net/wireless/ath/ath5k/pci.c
drivers/net/wireless/ath/ath5k/sysfs.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/ssb/driver_pcicore.c
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c
net/mac80211/scan.c
net/wireless/nl80211.c
net/wireless/scan.c