summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* vhost: remove the dead branchZhi Yong Wu2013-12-065-24/+6
* tg3: Update version to 3.135Nithin Sujir2013-12-061-2/+2
* tg3: Expand multicast drop counter miscounting fix to 5762Nithin Sujir2013-12-061-0/+3
* tg3: Fix bit definition for the nvram Auto Power Down settingNithin Sujir2013-12-061-1/+1
* tg3: Add flag to disable 1G Half Duplex advertisementNithin Sujir2013-12-062-7/+25
* tg3: Don't add rxbds_empty to rx_over_errorsNithin Sujir2013-12-061-2/+0
* Merge branch 'of_mdio'David S. Miller2013-12-065-92/+89
|\
| * Documentation: update Ethernet PHY devices binding with 'max-speed'Florian Fainelli2013-12-061-0/+1
| * arc_emac: remove custom "max-speed" parsing codeFlorian Fainelli2013-12-062-21/+1
| * net: of_mdio: parse "max-speed" property to set PHY supported featuresFlorian Fainelli2013-12-061-1/+24
| * net: phy: breakdown PHY_*_FEATURES definesFlorian Fainelli2013-12-061-7/+16
| * net: of_mdio: do not overwrite PHY interrupt configurationFlorian Fainelli2013-12-061-2/+3
| * net: of_mdio: use PHY_MAX_ADDR constantFlorian Fainelli2013-12-061-1/+1
| * net: of_mdio: factor PHY registration from of_mdiobus_registerFlorian Fainelli2013-12-061-63/+46
|/
* sctp: fix some comments in associola.cwangweidong2013-12-061-4/+4
* sctp: convert sctp_peer_needs_update to booleanwangweidong2013-12-061-3/+3
* sctp: remove the else pathwangweidong2013-12-061-7/+3
* sctp: remove the duplicate initializewangweidong2013-12-061-41/+0
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2013-12-0612-153/+155
|\
| * i40e: sync header files with hardwareAnjali Singhai Jain2013-12-062-9/+6
| * i40e: restrict diag test lengthKamil Krawczyk2013-12-061-4/+4
| * i40e: add support for triggering EMPRShannon Nelson2013-12-063-0/+23
| * i40e: add interrupt testShannon Nelson2013-12-063-2/+14
| * i40e: default debug mask settingShannon Nelson2013-12-061-0/+1
| * i40e: fix debugging messagesMitch Williams2013-12-061-2/+2
| * i40e: properly add VF MAC addressesMitch Williams2013-12-061-1/+1
| * i40e: retry call on timeoutShannon Nelson2013-12-061-6/+20
| * i40e: select reset counters correctlyShannon Nelson2013-12-061-3/+3
| * i40e: allow one more vector for VFsMitch Williams2013-12-061-1/+1
| * i40e: firmware version fields offsets updateAnjali Singhai jain2013-12-062-8/+16
| * i40e: simplify aq head-tail-len setupsShannon Nelson2013-12-062-36/+15
| * i40e: clear AQ head and tail registersShannon Nelson2013-12-061-4/+14
| * i40e: register file updatesAnjali Singhai jain2013-12-061-90/+44
| * i40e: set pf_id based on device and function numbersChristopher Pau2013-12-061-1/+5
* | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2013-12-06161-6258/+7162
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-12-06161-6258/+7162
| |\ \ | | |/ | |/|
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-12-0634-103/+233
| | |\
| | * | ath: fix dynamic user regulatory domain supportLuis R. Rodriguez2013-12-051-6/+22
| | * | ath: dynamic user allow check helper to the topLuis R. Rodriguez2013-12-051-12/+11
| | * | ath: move dynamic_country_user_possible() to the topLuis R. Rodriguez2013-12-051-72/+72
| | * | ath: fix usage of freq_reg_info()Luis R. Rodriguez2013-12-051-1/+1
| | * | ath: move the channel for ath_reg_apply_beaconing_flags() into helperLuis R. Rodriguez2013-12-051-19/+20
| | * | ath: simplify ath_reg_apply_beaconing_flags()Luis R. Rodriguez2013-12-051-21/+10
| | * | ath: rename ath_reg_apply_active_scan_flags() to ath_reg_apply_ir_flags()Luis R. Rodriguez2013-12-051-3/+3
| | * | ath: clean up ath_reg_apply_active_scan_flags()Luis R. Rodriguez2013-12-051-38/+63
| | * | ath: fix logic on ath_reg_apply_active_scan_flags()Luis R. Rodriguez2013-12-051-6/+6
| | * | wcn36xx: fix typo errorChun-Yeow Yeoh2013-12-052-3/+3
| | * | rtlwifi: rtl8188ee: Fix typo in codeLarry Finger2013-12-051-1/+1
| | * | bcma: pci: remove unnecessary pci_set_drvdata()Jingoo Han2013-12-051-1/+0
| | * | wireless: libertas: remove unnecessary spi_set_drvdata()Jingoo Han2013-12-051-1/+0