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-2341-186/+1973
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-08-1924-137/+174
| |\
| | * iwlwifi: use long monitor timer for 5300 seriesWey-Yi Guy2010-08-181-2/+2
| | * drivers/net/wireless: Restore upper case words in wiphy_<level> messagesJoe Perches2010-08-1813-50/+50
| | * iwlwifi: fix 3945 filter flagsJohannes Berg2010-08-174-50/+94
| | * ipw2100: don't sync status queue entriesJohn W. Linville2010-08-171-8/+0
| | * iwlwifi: use long monitor timer to avoid un-necessary reloadWey-Yi Guy2010-08-142-11/+11
| | * iwlwifi: long monitor timerWey-Yi Guy2010-08-146-29/+30
| * | e1000e: don't check for alternate MAC addr on parts that don't support itBruce Allan2010-08-193-13/+31
| * | e1000e: disable ASPM L1 on 82573Bruce Allan2010-08-191-0/+1
| * | ll_temac: Fix poll implementationMichal Simek2010-08-191-2/+2
| * | netxen: fix a race in netxen_nic_get_stats()Eric Dumazet2010-08-191-2/+0
| * | qlnic: fix a race in qlcnic_get_stats()Eric Dumazet2010-08-191-2/+0
| * | net: sh_eth: remove unused variableKuninori Morimoto2010-08-191-1/+1
| * | netxen: update version 4.0.74Amit Kumar Salecha2010-08-191-2/+2
| * | netxen: fix inconsistent lock stateAmit Kumar Salecha2010-08-191-4/+0
| * | ibmveth: Fix opps during MTU change on an active deviceRobert Jennings2010-08-191-17/+15
| * | ehea: Fix synchronization between HW and SW send queueAndre Detsch2010-08-182-2/+61
| * | bnx2x: Update bnx2x version to 1.52.53-4Yaniv Rosner2010-08-181-2/+2
| * | bnx2x: Fix PHY locking problemYaniv Rosner2010-08-181-2/+7
| * | net: add Fast Ethernet driver for PXA168.Sachin Sanap2010-08-183-0/+1677
* | | ipheth: add support for iPhone 4Jens Axboe2010-08-231-0/+5
* | | 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
OpenPOWER on IntegriCloud