aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
Commit message (Expand)AuthorAge
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-09-10
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-09-07
| |\
| | * ath9k_hw: fix parsing of HT40 5 GHz CTLsLuis R. Rodriguez2010-08-31
| | * ath9k_hw: Fix EEPROM uncompress block reading on AR9003Luis R. Rodriguez2010-08-31
| | * p54: fix tx feedback status flag checkChristian Lamparter2010-08-30
| | * ath5k: check return value of ieee80211_get_tx_rateJohn W. Linville2010-08-30
| | * libertas: if_sdio: fix buffer alignment in struct if_sdio_cardMike Rapoport2010-08-27
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-23
| |\|
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-17
| |\ \
* | \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-09-02
|\ \ \ \
| * | | | rt2x00: Cleanup rt2x00usb_watchdog_reset_txIvo van Doorn2010-08-31
| * | | | rt2x00: Split watchdog check into a DMA and STATUS timeoutIvo van Doorn2010-08-31
| * | | | rt2x00: Correctly kill beacon queueIvo van Doorn2010-08-31
| * | | | rt2x00: Set PWR_PIN_CFG during initializationIvo van Doorn2010-08-31
| * | | | rt2x00: Don't set unicast/BSSID masks when clearning MAC or BSSIDIvo van Doorn2010-08-31
| * | | | rt2x00: Wakeup hardware before loading firmwareIvo van Doorn2010-08-31
| * | | | rt2x00: Validate TX status results with current data entryIvo van Doorn2010-08-31
| * | | | rt2x00: Add rt2800_wait_csr_readyIvo van Doorn2010-08-31
| * | | | rt2x00: Update rt2800 comments regarding AMPDU and PACKET_ID in TXWIHelmut Schaa2010-08-31
| * | | | rt2x00: Rename txentry_desc.queue -> txentry_desc.qidHelmut Schaa2010-08-31
| * | | | ath9k: fix spurious MIC failure reportsFelix Fietkau2010-08-31
| * | | | wl1251: Fix queue stopping/waking for TX pathDenis 'GNUtoo' Carikli2010-08-31
| * | | | Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel...John W. Linville2010-08-31
| |\ \ \ \
| | * | | | iwlwifi: allow using multiple contextsJohannes Berg2010-08-27
| | * | | | iwlwifi: follow main beacon intervalJohannes Berg2010-08-27
| | * | | | iwlagn: always send RXON timingJohannes Berg2010-08-27
| | * | | | iwlwifi: pass context to iwl_send_rxon_timingJohannes Berg2010-08-27
| | * | | | iwlwifi: send PAN parametersJohannes Berg2010-08-27
| | * | | | iwlagn: send beacon before committing associated RXONJohannes Berg2010-08-27
| | * | | | iwlagn: send RXON timing before associatingJohannes Berg2010-08-27
| | * | | | iwlagn: queue frames according to contextJohannes Berg2010-08-27
| | * | | | iwlagn: remove iw_mode check for beaconJohannes Berg2010-08-27
| | * | | | iwlagn: detect PAN capabilityJohannes Berg2010-08-27
| | * | | | iwlwifi: add PAN APIJohannes Berg2010-08-27
| | * | | | iwlwifi: introduce beacon contextJohannes Berg2010-08-27
| | * | | | iwlwifi: move HT configuration data into contextJohannes Berg2010-08-27
| | * | | | iwlwifi: add context pointer to stationJohannes Berg2010-08-27
| | * | | | iwlwifi: store default station flags in contextJohannes Berg2010-08-27
| | * | | | iwlwifi: make hw crypto context awareJohannes Berg2010-08-27
| | * | | | iwlwifi: move AP sta ID to contextJohannes Berg2010-08-27
| | * | | | iwlwifi: clamp scanning dwell time to all contextsJohannes Berg2010-08-27
| | * | | | iwlwifi: move virtual interface pointer into contextJohannes Berg2010-08-27
| | * | | | iwlwifi: add context into tx descriptorJohannes Berg2010-08-27
| | * | | | iwlwifi: move QoS into contextJohannes Berg2010-08-27
| | * | | | iwlwifi: contextify command sendingJohannes Berg2010-08-27
| | * | | | iwlwifi: contextify-stations-completelyJohannes Berg2010-08-27
| | * | | | iwlwifi: contextify broadcast stationJohannes Berg2010-08-27
| | * | | | iwlwifi: define PAN queues/FIFOsJohannes Berg2010-08-27
| | * | | | iwlwifi: prepare for PAN queue/fifo assignmentJohannes Berg2010-08-27
| | * | | | iwlwifi: initial contextificationJohannes Berg2010-08-27