summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: sched: consolidate tc_classify{,_compat}Daniel Borkmann2015-08-2716-47/+40
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2015-08-2715-3166/+188
|\
| * i40e/i40evf: Bump i40e to 1.3.9 and i40evf to 1.3.5Catherine Sullivan2015-08-272-3/+3
| * i40e/i40evf: Cache the CEE TLV status returned from firmwareNeerav Parikh2015-08-273-0/+6
| * i40e/i40evf: add VIRTCHNL_VF_OFFLOAD flagAnjali Singhai Jain2015-08-274-0/+21
| * i40e: Remove redundant and unneeded messagesGreg Rose2015-08-272-4/+0
| * i40evf: Remove PF specific register definitions from the VFAnjali Singhai Jain2015-08-273-3108/+4
| * i40evf: Use the correct defines to match the VF registersAnjali Singhai Jain2015-08-272-33/+33
| * i40e: correct spelling errorMitch Williams2015-08-271-1/+1
| * i40e: Fix comment for ethtool diagnostic link testGreg Rose2015-08-261-3/+5
| * i40e/i40evf: Add capability to gather VEB per TC statsNeerav Parikh2015-08-265-2/+67
| * i40e: Fix ethtool offline diagnostic with netqueuesGreg Rose2015-08-261-2/+17
| * i40e: Fix legacy interrupt mode in the driverAnjali Singhai Jain2015-08-261-4/+12
| * i40e: Move function calls to i40e_shutdown instead of i40e_suspendCatherine Sullivan2015-08-261-3/+13
| * i40e: add RX to port CRC errors labelShannon Nelson2015-08-261-1/+1
| * i40e: don't degrade __le16Mitch Williams2015-08-262-2/+5
* | smsc9194: Remove uncompilable #if 0'd use of pr_dbgJoe Perches2015-08-271-30/+2
* | Merge branch 'xgene-tso'David S. Miller2015-08-275-29/+283
|\ \
| * | drivers: net: xgene: Adding support for TSOIyappan Subramanian2015-08-275-24/+262
| * | drivers: net: xgene: Preparatory patch for TSO supportIyappan Subramanian2015-08-272-7/+23
|/ /
* | Merge branch 'ovs-conntrack'David S. Miller2015-08-2718-107/+1336
|\ \
| * | openvswitch: Allow attaching helpers to ct actionJoe Stringer2015-08-272-2/+110
| * | openvswitch: Allow matching on conntrack labelJoe Stringer2015-08-2710-34/+199
| * | netfilter: connlabels: Export setting connlabel lengthJoe Stringer2015-08-273-12/+40
| * | netfilter: Always export nf_connlabels_replace()Joe Stringer2015-08-271-2/+0
| * | openvswitch: Allow matching on conntrack markJoe Stringer2015-08-276-4/+83
| * | openvswitch: Add conntrack actionJoe Stringer2015-08-2713-37/+877
| * | dst: Add __skb_dst_copy() variationJoe Stringer2015-08-271-2/+7
| * | ipv6: Export nf_ct_frag6_gather()Joe Stringer2015-08-271-0/+1
| * | openvswitch: Move MASKED* macros to datapath.hJoe Stringer2015-08-272-27/+29
| * | openvswitch: Serialize acts with original netlink lenJoe Stringer2015-08-273-1/+4
|/ /
* | bgmac: support up to 3 cores (devices) on a busRafał Miłecki2015-08-271-5/+23
* | Merge tag 'wireless-drivers-next-for-davem-2015-08-26' of git://git.kernel.or...David S. Miller2015-08-2737-196/+693
|\ \
| * \ Merge ath-next from ath.gitKalle Valo2015-08-2616-95/+348
| |\ \
| | * | ath10k: fix compilation warnings in wmi phyerr pull functionRaja Mani2015-08-261-2/+2
| | * | ath10k: add qca6164 supportMichal Kazior2015-08-263-0/+25
| | * | ath10k: add spectral scan support for 10.4 fwRaja Mani2015-08-262-0/+11
| | * | ath10k: fix dma_mapping_error() handlingMichal Kazior2015-08-264-5/+16
| | * | ath10k: add missing mutex unlock on failpathMichal Kazior2015-08-261-1/+2
| | * | ath10k: free collected fw stats memory if .pull_fw_stats failsRaja Mani2015-08-191-2/+1
| | * | ath10k: ensure pktlog disable cmd reaches fw before pdev suspendRaja Mani2015-08-191-1/+1
| | * | ath10k: fill in wmi 10.4 command handlers for addba/delba debug commandsVasanthakumar Thiagarajan2015-08-171-0/+4
| | * | ath10k: handle 10.4 firmware phyerr eventRaja Mani2015-08-172-0/+84
| | * | ath10k: refactor phyerr event handlersRaja Mani2015-08-176-67/+149
| | * | wil6210: match wait_for_completion_timeout return typeNicholas Mc Guire2015-08-171-1/+1
| | * | ath10k: split ap/ibss wep key install processMichal Kazior2015-08-171-12/+32
| | * | ath10k: add cycle/rx_clear counters frequency to hw_paramsVasanthakumar Thiagarajan2015-08-174-4/+10
| | * | ath10k: fix invalid survey reporting for QCA99X0Vasanthakumar Thiagarajan2015-08-172-2/+5
| | * | ath10k: wake up queue upon vif creationMichal Kazior2015-08-171-0/+5
| | * | ath10k: wake up offchannel queue properlyMichal Kazior2015-08-171-0/+2