aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | net: calxedaxgmac: fix condition in xgmac_set_features()Dan Carpenter2013-04-251-1/+1
|/
* openvswitch: Use parallel_ops genl.Pravin B Shelar2013-04-251-4/+8
* genl: Allow concurrent genl callbacks.Pravin B Shelar2013-04-252-38/+77
* irda: irlmp_reasons[] can be staticWu Fengguang2013-04-251-1/+1
* net: remove redundant code in dev_hard_start_xmit()Eric Dumazet2013-04-251-7/+0
* packet: account statistics only in tpacket_stats_uDaniel Borkmann2013-04-252-23/+17
* packet: reorder a member in packet_ring_bufferDaniel Borkmann2013-04-251-1/+3
* Merge branch 'af_packet-timestamp'David S. Miller2013-04-254-45/+122
|\
| * packet: doc: update timestamping partDaniel Borkmann2013-04-251-6/+35
| * packet: if hw/sw ts enabled in rx/tx ring, report which ts we gotDaniel Borkmann2013-04-252-13/+28
| * packet: minor: convert status bits into shifting formatDaniel Borkmann2013-04-251-11/+11
| * packet: enable hardware tx timestamping on tpacket ringDaniel Borkmann2013-04-251-25/+25
| * packet: tx timestamping on tpacket ringWillem de Bruijn2013-04-252-6/+39
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2013-04-2512-94/+212
|\
| * igb: Bump version of driverCarolyn Wyborny2013-04-241-3/+3
| * igb: Remove id's that will not be productized for Linux.Carolyn Wyborny2013-04-242-4/+0
| * igb: Remove dead code pathMatthew Vick2013-04-241-4/+0
| * igb: Retain HW VLAN filtering while in promiscuous + VT modeGreg Rose2013-04-241-1/+68
| * igb: display a warning message when SmartSpeed worksKoki Sanagi2013-04-241-0/+6
| * igb: Use pci_vfs_assigned instead of igb_vfs_are_assignedAlexander Duyck2013-04-241-35/+1
| * pci: Add SRIOV helper function to determine if VFs are assigned to guestAlexander Duyck2013-04-242-0/+46
| * igb: Add SMBI semaphore to I210/I211Matthew Vick2013-04-243-26/+43
| * igb: SERDES loopback sigdetect bit on i210 devicesAkeem G. Abodunrin2013-04-241-7/+2
| * ixgbe: add WOL support for new subdevice IDEmil Tantilov2013-04-242-0/+2
| * ixgbe: add SFP+ LX module supportDon Skidmore2013-04-244-10/+25
| * ixgbe: rename wol_supported to more fitting wol_enabledJacob Keller2013-04-243-4/+4
| * ixgbe: add driver support for x520 OCP adapter.Don Skidmore2013-04-242-0/+9
| * ixgbe: fix possible divide by zero in ixgbe_update_itrDon Skidmore2013-04-241-0/+3
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-04-2511-55/+64
|\ \
| * | netfilter: nf_nat: missing condition in nf_xfrm_me_harder()Dan Carpenter2013-04-251-0/+1
| * | ipvs: Use network byte order for sync message sizeSimon Horman2013-04-231-13/+8
| * | ipvs: off by one in set_sctp_state()Dan Carpenter2013-04-231-1/+1
| * | ipvs: Use min3() in ip_vs_dbg_callid()Simon Horman2013-04-231-1/+2
| * | ipvs: Avoid shadowing net variable in ip_vs_leave()Simon Horman2013-04-231-2/+2
| * | ipvs: fix sparse warnings for some parametersJulian Anastasov2013-04-234-23/+32
| * | ipvs: fix sparse warnings in lblc and lblcrJulian Anastasov2013-04-232-2/+2
| * | ipvs: fix the remaining sparse warnings in ip_vs_ctl.cJulian Anastasov2013-04-231-4/+6
| * | ipvs: fix sparse warnings for ip_vs_conn listingJulian Anastasov2013-04-231-8/+6
| * | ipvs: properly dereference dest_dst in ip_vs_forget_devJulian Anastasov2013-04-231-1/+4
* | | Merge branch 'qlcnic'David S. Miller2013-04-246-61/+277
|\ \ \ | |_|/ |/| |
| * | qlcnic: Update version to 5.2.42Shahed Shaikh2013-04-241-2/+2
| * | qlcnic: Add identifying string for 83xx adapterHimanshu Madhani2013-04-241-19/+106
| * | qlcnic: Rename the IRQ description.Himanshu Madhani2013-04-242-9/+18
| * | qlcnic: Enable Interrupt Coalescing for 83xx adapterHimanshu Madhani2013-04-244-22/+87
| * | qlcnic: Add eSwitch statistics supportShahed Shaikh2013-04-243-1/+11
| * | qlcnic: Take EPORT out of reset sequence before disabling PAUSEManish Chopra2013-04-241-0/+25
| * | qlcnic: Enhance channel configuration logsManish Chopra2013-04-243-8/+28
|/ /
* | Merge branch 'bnx2x'David S. Miller2013-04-246-28/+59
|\ \
| * | bnx2x: Allow recovery from second slot resetYuval Mintz2013-04-241-0/+1
| * | bnx2x: Fix memory leakYuval Mintz2013-04-242-3/+3