aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
Commit message (Expand)AuthorAge
* Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2012-10-02
|\
| *-. Merge branches 'cma', 'cxgb4', 'ipoib', 'mlx4', 'mlx4-sriov', 'nes', 'qib' an...Roland Dreier2012-10-02
| |\ \
| | | * mlx4_core: Disable SENSE_PORT for multifunction devicesRoland Dreier2012-10-01
| | | * mlx4_core: Clean up enabling of SENSE_PORT for older (ConnectX-1/-2) HCAsRoland Dreier2012-10-01
| | | * mlx4_core: Stash PCI ID driver_data in mlx4_priv structureRoland Dreier2012-10-01
| | | * mlx4_core: Fix crash on uninitialized priv->cmd.slave_semRoland Dreier2012-09-30
| | | * mlx4_core: Trivial cleanups to driver log messagesRoland Dreier2012-09-30
| | | * mlx4_core: Trivial readability fix: "0X30" -> "0x30"Roland Dreier2012-09-30
| | | * mlx4: Modify proxy/tunnel QP mechanism so that guests do no calculationsJack Morgenstein2012-09-30
| | | * mlx4: Paravirtualize Node Guids for slavesJack Morgenstein2012-09-30
| | | * mlx4: Activate SR-IOV mode for IBJack Morgenstein2012-09-30
| | | * IB/mlx4: Miscellaneous adjustments for SR-IOV IB supportJack Morgenstein2012-09-30
| | | * mlx4_core: INIT/CLOSE port logic for IB ports in SR-IOV modeJack Morgenstein2012-09-30
| | | * net/mlx4_core: Adjustments to SET_PORT for IB SR-IOVJack Morgenstein2012-09-30
| | | * IB/mlx4: Propagate P_Key and guid change port management events to slavesJack Morgenstein2012-09-30
| | | * mlx4: Add alias_guid mechanismJack Morgenstein2012-09-30
| | | * mlx4_core: Add IB port-state machine and port mgmt event propagationJack Morgenstein2012-09-30
| | | * mlx4: MAD_IFC paravirtualizationJack Morgenstein2012-09-30
| | | * mlx4: Implement QP paravirtualization and maintain phys_pkey_cache for smp_snoopJack Morgenstein2012-09-30
| | | * IB/mlx4: Initialize SR-IOV IB support for slaves in master contextJack Morgenstein2012-09-30
| | | * mlx4_core: Add proxy and tunnel QPs to the reserved QP areaJack Morgenstein2012-09-30
| | |/ | |/|
| | * mlx4_core: Remove annoying debug message in the resource trackerOr Gerlitz2012-09-30
| | * mlx4_core: Fix wrong offset in parsing query device caps responseDotan Barak2012-09-30
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-10-02
|\ \
| * \ Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh...David S. Miller2012-10-01
| |\ \
| | * | sfc: Fix the reported priorities of different filter typesBen Hutchings2012-10-01
| | * | sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IPBen Hutchings2012-10-01
| | * | sfc: Fix loopback self-test with separate_tx_channels=1Ben Hutchings2012-10-01
| | * | sfc: Fix MCDI structure field lookupBen Hutchings2012-10-01
| | * | sfc: Add parentheses around use of bitfield macro argumentsBen Hutchings2012-10-01
| | * | sfc: Fix null function pointer in efx_sriov_channel_typeBen Hutchings2012-10-01
| * | | netlink: add attributes to fdb interfacestephen hemminger2012-10-01
| * | | tg3: unconditionally select HWMON support when tg3 is enabled.Paul Gortmaker2012-10-01
| * | | Revert "net: ti cpsw ethernet: allow reading phy interface mode from DT"David S. Miller2012-10-01
| * | | net: ti cpsw ethernet: allow reading phy interface mode from DTDaniel Mack2012-10-01
| * | | net: ti cpsw ethernet: set IFCTL_A bit in MACCONTROLDaniel Mack2012-10-01
| * | | mlx4: dont orphan skbs in mlx4_en_xmit()Eric Dumazet2012-10-01
| * | | bnx2x: update version to 1.78.00-0.Yuval Mintz2012-10-01
| * | | bnx2x,cnic: use FW 7.8.2Yuval Mintz2012-10-01
| * | | be2net: fix vfs enumerationIvan Vecera2012-10-01
| * | | be2net: fixup log messagesSathya Perla2012-09-30
| * | | be2net: cleanup code related to be_link_status_query()Sathya Perla2012-09-30
| * | | be2net: fix wrong handling of be_setup() failure in be_probe()Sathya Perla2012-09-30
| * | | be2net: remove type argument of be_cmd_mac_addr_query()Sathya Perla2012-09-30
| * | | tg3: Disable multiple TX rings by default due to hardware flawMichael Chan2012-09-30
| * | | tg3: Add support for ethtool -L|-l to get/set the number of rings.Michael Chan2012-09-30
| * | | tg3: Refactor tg3_close()Michael Chan2012-09-30
| * | | tg3: Refactor tg3_open()Michael Chan2012-09-30
| * | | tg3: Separate coalescing setup for rx and txMichael Chan2012-09-30
| * | | tg3: Allow number of rx and tx rings to be set independently.Michael Chan2012-09-30