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-297-36/+63
|\
| * qlge: reset the chip before freeing the buffersBreno Leitao2010-08-261-2/+2
| * pxa168_eth: silence gcc warningsDan Carpenter2010-08-241-3/+3
| * pxa168_eth: update call to phy_mii_ioctl()Dan Carpenter2010-08-241-1/+1
| * pxa168_eth: fix error handling in propeDan Carpenter2010-08-241-22/+22
| * pxa168_eth: remove unneeded null checkDan Carpenter2010-08-241-4/+2Star
| * phylib: Fix race between returning phydev and calling adjust_linkAnton Vorontsov2010-08-241-0/+2
| * caif-driver: add HAS_DMA dependencyHeiko Carstens2010-08-241-1/+1
| * 3c59x: Fix deadlock between boomerang_interrupt and boomerang_start_txNeil Horman2010-08-241-1/+14
| * qlcnic: fix poll implementationYinglin Luan2010-08-241-1/+8
| * netxen: fix poll implementationYinglin Luan2010-08-241-1/+8
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-08-281-1/+1
|\ \
| * | Input: sysrq - drop tty argument from sysrq ops handlersDmitry Torokhov2010-08-201-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-2441-186/+1973
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-08-2024-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/+0Star
| | * | 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-203-13/+31
| * | | e1000e: disable ASPM L1 on 82573Bruce Allan2010-08-201-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/+0Star
| * | | qlnic: fix a race in qlcnic_get_stats()Eric Dumazet2010-08-191-2/+0Star
| * | | 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/+0Star
| * | | ibmveth: Fix opps during MTU change on an active deviceRobert Jennings2010-08-191-17/+15Star
| * | | ehea: Fix synchronization between HW and SW send queueAndre Detsch2010-08-192-2/+61
| * | | bnx2x: Update bnx2x version to 1.52.53-4Yaniv Rosner2010-08-191-2/+2
| * | | bnx2x: Fix PHY locking problemYaniv Rosner2010-08-191-2/+7
| * | | net: add Fast Ethernet driver for PXA168.Sachin Sanap2010-08-193-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-1810-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-141-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-1319-180/+160Star
|\| |
| * | phylib: available for any speed ethernetRandy Dunlap2010-08-121-1/+1
| * | caif-spi: Bugfix SPI_DATA_POS settings were inverted.Sjur Braendeland2010-08-111-2/+2
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-08-1113-135/+88Star
| |\|
| | * iwlagn: fix rts cts protectionJohannes Berg2010-08-0911-133/+87Star
| | * libertas: fix build break by including linux/sched.hJohn W. Linville2010-08-091-0/+1