aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54
Commit message (Expand)AuthorAge
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-06-17
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-06-17
| |\
| | * p54pci: add Symbol AP-300 minipci adapters pciidJoerg Albert2010-06-14
| * | p54usb: Comment out duplicate Medion MD40900 device idLeann Ogasawara2010-06-16
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-06-11
|\| |
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-06-07
| |\|
| | * p54usb: Add device ID for Dell WLA3310 USBJason Dravet2010-06-07
| * | p54spi: replace internal "cx3110x" name with "p54spi"Luke-Jr2010-06-04
| * | drivers/net/wireless/p54: Use kmemdupJulia Lawall2010-06-02
| |/
* / drivers/net: use __packed annotationEric Dumazet2010-06-03
|/
* drivers/net: Remove unnecessary returns from void function()sJoe Perches2010-05-14
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-05-05
|\
| * Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel...John W. Linville2010-05-03
| |\
| | * Merge branch 'wireless-2.6' into wireless-next-2.6Reinette Chatre2010-04-30
| | |\
| * | | mac80211: remove deprecated noise field from ieee80211_rx_statusJohn W. Linville2010-04-30
| |/ /
| * | p54: remove usage of deprecated noise valueJohn W. Linville2010-04-28
| * | p54pci: fix regression from prevent stuck rx-ring on slow systemHans de Goede2010-04-26
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-05-03
|\ \ \
| * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-04-30
| |\ \ \ | | | |/ | | |/|
| | * | p54pci: fix bugs in p54p_check_tx_ringHans de Goede2010-04-26
* | | | Merge branch 'master' into for-davemJohn W. Linville2010-04-23
|\ \ \ \ | | |_|/ | |/| |
| * | | p54pci: fix serious sparse warningChristian Lamparter2010-04-16
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-04-15
|\| | |
| * | | p54pci: prevent stuck rx-ring on slow systemQuintin Pitts2010-04-12
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-04-08
| |\ \ \ | | | |/ | | |/|
| * | | wireless/prism54: remove trailing space in messagesFrans Pop2010-03-31
* | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-04-11
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-04-06
| |\ \ \ | | | |/ | | |/|
| * | | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-30
* | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-04-07
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Add USB ID for Thomson SpeedTouch 120g to p54usb id tableHans de Goede2010-03-30
| |/
* / p54: Enable HW_REPORTS_TX_ACK_STATUSChristian Lamparter2010-03-09
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-02-26
|\
| * p54: convert to new station add/remove callbacksJohannes Berg2010-02-19
| * p54usb: Add the USB ID for Belkin (Accton) FD7050E ver 1010ecJean-François Moine2010-02-19
| * drivers/net/wireless/p54/txrx.c Fix off by one errorDarren Jenkins2010-02-19
| * p54usb: Add usbid for Corega CG-WLUSB2GT.Shimada Hirofumi2010-02-15
* | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2010-02-14
|\|
| * p54: remove get_tx_stats() mac80211 opKalle Valo2010-02-08
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-02-04
|\|
| * p54pci: revise tx lockingChristian Lamparter2010-01-22
| * p54pci: move tx cleanup into taskletChristian Lamparter2010-01-19
| * p54pci: handle dma mapping errorsChristian Lamparter2010-01-19
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6John W. Linville2010-01-19
| |\
* | \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-01-23
|\ \ \ | | |/ | |/|
| * | p54pci: rx frame length checkChristian Lamparter2010-01-18
* | | drivers/net/: use DEFINE_PCI_DEVICE_TABLE()Alexey Dobriyan2010-01-08
| |/ |/|
* | mac80211: remove struct ieee80211_if_init_confJohannes Berg2009-12-28
|/
* cfg80211: convert bools into flagsJohannes Berg2009-11-19
* drivers/net/wireless/p54: remove exceptional & on function nameJulia Lawall2009-11-18