summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2015-12-318-59/+32
|\
| * Bluetooth: bfusb: Fix the return error codeSyam Sidhardhan2015-12-221-1/+1
| * Bluetooth: bfusb: Remove redundant error messageSyam Sidhardhan2015-12-221-3/+1
| * Bluetooth: bcm203x: Remove redundant error messageSyam Sidhardhan2015-12-221-3/+1
| * Bluetooth: hci_bcm: Add BCM2E65 ACPI IDLuka Karinja2015-12-201-0/+1
| * 6lowpan: fix debugfs interface entry nameAlexander Aring2015-12-201-3/+3
| * Bluetooth: use list_for_each_entry*Geliang Tang2015-12-204-49/+25
* | Merge branch 'ethtool-phy-stats'David S. Miller2015-12-315-1/+320
|\ \
| * | phy: micrel: Add ethtool statistics countersAndrew Lunn2015-12-311-0/+96
| * | phy: marvell: Add ethtool statistics countersAndrew Lunn2015-12-311-0/+135
| * | ethtool: Add phy statisticsAndrew Lunn2015-12-313-1/+89
|/ /
* | Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe...David S. Miller2015-12-307-32/+62
|\ \
| * | ixgbe: Fix bugs in ixgbe_clear_vf_vlans()Alexander Duyck2015-12-301-4/+4
| * | ixgbe: Correct X550EM_x revision checkMark Rustad2015-12-302-7/+4
| * | ixgbe: fix RSS limit for X550Emil Tantilov2015-12-301-1/+1
| * | ixgbe: Clean up redundancy in hw_enc_featuresMark Rustad2015-12-301-5/+2
| * | ixgbe: report correct media type for KR, KX and KX4 interfacesVeola Nazareth2015-12-301-13/+42
| * | ixgbe: add support for QSFP PHY types in ixgbe_get_settings()Emil Tantilov2015-12-301-0/+4
| * | ixgbevf: minor cleanups for ixgbevf_set_itr()Emil Tantilov2015-12-301-2/+3
| * | ixgbevf: Fix handling of NAPI budget when multiple queues are enabled per vectorWilliam Dauchy2015-12-301-0/+2
* | | Merge branch 'be2net-next'David S. Miller2015-12-305-776/+841
|\ \ \ | |/ / |/| |
| * | be2net: bump up the driver version to 11.0.0.0Suresh Reddy2015-12-301-1/+1
| * | be2net: support ethtool get-dump optionVenkat Duvvuru2015-12-305-57/+71
| * | be2net: fix port-res desc query of GET_PROFILE_CONFIG FW cmdSuresh Reddy2015-12-304-53/+63
| * | be2net: remove unused error variablesVenkat Duvvuru2015-12-301-4/+0
| * | be2net: remove a line of code that has no effectSathya Perla2015-12-303-4/+3
| * | be2net: log digital signature errors while flashing FW imageSuresh Reddy2015-12-302-2/+16
| * | be2net: move FW flash cmd code to be_cmds.cSuresh Reddy2015-12-303-584/+578
| * | be2net: cleanup FW flash image related macro definesSuresh Reddy2015-12-302-101/+118
| * | be2net: avoid configuring VEPA mode on BE3Suresh Reddy2015-12-301-0/+3
| * | be2net: fix VF link state transition from disabled to autoSuresh Reddy2015-12-302-10/+28
|/ /
* | net: hns: use to_platform_device()Geliang Tang2015-12-291-2/+1
* | atm: solos-pci: use to_pci_dev()Geliang Tang2015-12-291-3/+3
* | Merge branch 'bpf_hash-locking'David S. Miller2015-12-291-26/+38
|\ \
| * | bpf: hash: use per-bucket spinlocktom.leiming@gmail.com2015-12-291-18/+32
| * | bpf: hash: move select_bucket() out of htab's spinlocktom.leiming@gmail.com2015-12-291-4/+2
| * | bpf: hash: use atomic counttom.leiming@gmail.com2015-12-291-6/+6
|/ /
* | Merge branch 'bnxt_en-next'David S. Miller2015-12-285-731/+544
|\ \
| * | bnxt_en: Add BCM57301 & BCM57402 devices.David Christensen2015-12-281-2/+8
| * | bnxt_en: Update to Firmware interface spec 1.0.0.Michael Chan2015-12-284-572/+349
| * | bnxt_en: Keep track of the ring group resource.Michael Chan2015-12-283-2/+18
| * | bnxt_en: Improve VF resource accounting.Michael Chan2015-12-283-14/+12
| * | bnxt_en: Cleanup bnxt_hwrm_func_cfg().Michael Chan2015-12-281-17/+16
| * | bnxt_en: Check hardware resources before enabling NTUPLE.Michael Chan2015-12-282-8/+35
| * | bnxt_en: Don't treat single segment rx frames as GRO frames.Michael Chan2015-12-281-1/+6
| * | bnxt_en: Allocate rx_cpu_rmap only if Accelerated RFS is enabled.Michael Chan2015-12-281-3/+1
| * | bnxt_en: Increment checksum error counter only if NETIF_F_RXCSUM is set.Satish Baddipadige2015-12-281-2/+4
| * | bnxt_en: Add support for upgrading APE/NC-SI firmware via Ethtool FLASHDEVRob Swindell2015-12-281-0/+3
| * | bnxt_en: Optimize ring alloc and ring free functions.Michael Chan2015-12-281-114/+87
| * | bnxt_en: support hwrm_func_drv_unrgtr commandJeffrey Huang2015-12-281-0/+9
|/ /