aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-12-2612-11/+143
|\
| * Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2010-12-224-4/+8
| |\
| | * hostap: remove netif_stop_queue from initMeelis Roos2010-12-201-1/+0
| | * mac80211/rt2x00: add ieee80211_tx_status_ni()Johannes Stezenbach2010-12-203-3/+8
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-12-158-7/+135
| |\ \ | | |/
| | * p54usb: New USB ID for Gemtek WUBI-100GWEduardo Costa2010-12-141-0/+1
| | * p54usb: add 5 more USBIDsChristian Lamparter2010-12-131-0/+5
| | * libertas: fix potential NULL-pointer dereferenceSven Neumann2010-12-131-1/+1
| | * iwlagn: implement layout-agnostic EEPROM readingWey-Yi Guy2010-12-096-1/+120
| | * iwlagn: rename enhanced txpower fieldsJohannes Berg2010-12-092-5/+8
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-12-1430-146/+182
|\ \ \ | |/ /
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-12-1015-63/+82
| |\ \ | | |/
| | * orinoco: fix TKIP countermeasure behaviourDavid Kilroy2010-12-081-2/+2
| | * orinoco: clear countermeasure setting on commitDavid Kilroy2010-12-081-0/+6
| | * ath9k_htc: Fix suspend/resumeSujith Manoharan2010-12-084-2/+18
| | * ath5k: Put the right tsf value in mesh beaconsJavier Cardona2010-12-081-1/+2
| | * ath5k: Prevent mesh interfaces from being counted as ad-hocJavier Cardona2010-12-081-1/+1
| | * ath5k: Fix beaconing in mesh modeJavier Cardona2010-12-081-3/+5
| | * orinoco: initialise priv->hw before assigning the interruptDavid Kilroy2010-12-082-14/+14
| | * ath9k: fix beacon resource related race conditionRajkumar Manoharan2010-12-071-14/+7
| | * ath9k: Fix STA disconnect issue due to received MIC failed bcast framesSenthil Balasubramanian2010-12-072-3/+9
| | * ath9k: fix a DMA related race condition on resetFelix Fietkau2010-12-073-19/+10
| | * ath9k: fix bug in tx powerMatteo Croce2010-12-071-4/+8
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-12-0819-90/+107
| |\ \ | | |/
| | * Revert "ath9k: Fix STA disconnect issue due to received MIC failed bcast frames"John W. Linville2010-12-022-4/+3
| | * ath9k_hw: fix more bitfield related endian issuesFelix Fietkau2010-12-022-9/+16
| | * ath9k_hw: fix endian issues with CTLs on AR9003Felix Fietkau2010-12-024-54/+47
| | * ath9k: Fix bug in reading input gpio state for ar9003Vasanthakumar Thiagarajan2010-12-022-3/+6
| | * ath9k: Fix STA disconnect issue due to received MIC failed bcast framesSenthil Balasubramanian2010-11-302-3/+4
| | * orinoco: abort scan on interface downDavid Kilroy2010-11-303-7/+14
| | * carl9170: fix carl9170_tx_prepare typoChristian Lamparter2010-11-291-1/+1
| | * ath9k: Disable SWBA interrupt on remove_interfaceRajkumar Manoharan2010-11-291-1/+10
| | * ath9k/carl9170: advertise P2PJohannes Berg2010-11-293-2/+6
| | * ath9k: use per-device struct for pm_qos_* operationsGabor Juhos2010-11-293-9/+7
| | * libertas: fix invalid accessSven Neumann2010-11-292-2/+0
| | * libertas: fix memory corruption in lbs_remove_card()Daniel Drake2010-11-291-2/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-11-293-2/+3
|\ \ \ | |/ /
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-11-243-2/+3
| |\ \ | | |/
| | * wireless: b43: fix error path in SDIOGuennadi Liakhovetski2010-11-231-0/+1
| | * carl9170: fix virtual interface setup crashChristian Lamparter2010-11-221-1/+1
| | * ath9k: fix timeout on stopping rx dmaFelix Fietkau2010-11-221-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-11-197-7/+23
|\ \ \ | |/ /
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-11-187-7/+23
| |\ \ | | |/
| | * ath9k_htc: Avoid setting QoS control for non-QoS framesRajkumar Manoharan2010-11-181-1/+1
| | * ath9k_hw: Set proper eeprom offset for AR9287 HTC devicesRajkumar Manoharan2010-11-162-1/+5
| | * ath9k_htc: Add new devices into AR7010Rajkumar Manoharan2010-11-163-1/+9
| | * ath9k_htc: Update usb device ID listRajkumar Manoharan2010-11-161-0/+5
| | * ath9k: Remove pm_qos request after hw unregister.Vivek Natarajan2010-11-161-2/+1
| | * carl9170: fix usb anchor wait timeoutChristian Lamparter2010-11-151-2/+2
* | | BKL: remove extraneous #include <smp_lock.h>Arnd Bergmann2010-11-171-1/+0
|/ /