summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-1710-16/+48
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-08-1610-16/+48
| |\
| | * ath5k: disable ASPM L0s for all cardsMaxim Levitsky2010-08-131-0/+21
| | * ath9k_htc: load proper firmware for device ID 7015Rajkumar Manoharan2010-08-135-7/+11
| | * wl1251: fix trigger scan timeout usageYuri Kululin2010-08-131-1/+1
| | * ath9k_htc: Fix disconnect issue in HT40 mode.Vivek Natarajan2010-08-131-1/+2
| | * ath9k_htc: fix panic on packet injection using airbase-ng tool.Rajkumar Manoharan2010-08-111-5/+10
| | * ipw2100: register pm_qos request before registering pci driverJohn W. Linville2010-08-111-2/+3
* | | pcmcia: xirc2ps_cs bugfixDominik Brodowski2010-08-131-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-1319-180/+160
|\| |
| * | phylib: available for any speed ethernetRandy Dunlap2010-08-111-1/+1
| * | caif-spi: Bugfix SPI_DATA_POS settings were inverted.Sjur Braendeland2010-08-101-2/+2
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-08-1013-135/+88
| |\|
| | * iwlagn: fix rts cts protectionJohannes Berg2010-08-0911-133/+87
| | * libertas: fix build break by including linux/sched.hJohn W. Linville2010-08-091-0/+1
| | * Revert "p54pci: Add PCI ID for SMC2802W"John W. Linville2010-08-091-2/+0
| * | usbnet: rx_submit() should return an error code.David S. Miller2010-08-101-6/+16
| * | qlcnic: using too much stackDan Carpenter2010-08-101-6/+21
| * | qlcnic: clean up qlcnic_init_pci_info()Dan Carpenter2010-08-101-22/+23
| * | phy.c: fix kernel-doc warningsRandy Dunlap2010-08-101-1/+1
| * | farsync: Fix compile warnings.David S. Miller2010-08-101-7/+8
| |/
* | Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/...Linus Torvalds2010-08-124-15/+77
|\ \
| * | param: lock if_sdio's lbs_helper_name and lbs_fw_name against sysfs changes.Rusty Russell2010-08-111-2/+30
| * | param: lock myri10ge_fw_name against sysfs changes.Rusty Russell2010-08-111-13/+41
| * | param: simple locking for sysfs-writable charp parametersRusty Russell2010-08-112-0/+6
* | | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-1241-168/+168
|\ \ \
| * | | of/sparc: fix build regression from of_device changesGrant Likely2010-08-081-1/+1
| * | | of/device: Replace struct of_device with struct platform_deviceGrant Likely2010-08-0641-167/+167
* | | | Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/...Linus Torvalds2010-08-112-2/+2
|\ \ \ \
| * | | | IXP4xx: Make mdio_bus struct static in the Ethernet driver.Krzysztof Hałasa2010-05-271-1/+1
| * | | | IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.Krzysztof Hałasa2010-05-271-1/+1
* | | | | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-08-111-4/+2
|\ \ \ \ \
| * \ \ \ \ Merge branches 'master' and 'devel' into for-linusRussell King2010-08-101-4/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into dev...Russell King2010-08-061-4/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | net/irda/sh_irda: Modify clk_get lookupsKuninori Morimoto2010-08-041-4/+2
* | | | | | drivers/net/wireless/libertas/cfg.c: needs sched.hAndrew Morton2010-08-111-0/+2
|/ / / / /
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-0951-339/+927
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | e100/e1000*/igb*/ixgb*: Add missing read memory barrierJeff Kirsher2010-08-088-0/+18
| * | | | ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIGJohn Fastabend2010-08-081-4/+10
| * | | | netxen: protect tx timeout recovery by rtnl lockAmit Kumar Salecha2010-08-071-8/+7
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-08-0632-273/+836
| |\ \ \ \
| | * | | | iwlwifi: fix locking assertionsJohannes Berg2010-08-064-6/+6
| | * | | | iwlwifi: fix TX tracerJohannes Berg2010-08-061-1/+1
| | * | | | rtl8180: avoid potential NULL deref in rtl8180_beacon_workJohn W. Linville2010-08-051-0/+2
| | * | | | libertas: scan before assocation if no BSSID was givenDan Williams2010-08-053-33/+121
| | * | | | libertas: fix association with some APs by using extended ratesDan Williams2010-08-051-16/+40
| | * | | | libertas: get the right # of scanned BSSesDan Williams2010-08-051-1/+9
| | * | | | iwlagn: Improve aggregation failure error messagesAndy Lutomirski2010-08-041-4/+7
| | * | | | rt2x00: do not use PCI resources before pci_enable_device()Kulikov Vasiliy2010-08-041-11/+10
| | * | | | wireless: ipw2100: check result of kzalloc()Christoph Fritz2010-08-041-0/+4