diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-06-24 00:42:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-24 00:42:48 -0700 |
| commit | 12d4ae9d998cf5b832b2387fc0d2b5b9efcdd322 (patch) | |
| tree | 3e1720bf504ad6dcca7d4b1166ed4bce2e76c6d1 /net | |
| parent | Merge branch 'xgene-next' (diff) | |
| parent | net/mlx5e: Prefetch skb data on RX (diff) | |
| download | linux-dev-12d4ae9d998cf5b832b2387fc0d2b5b9efcdd322.tar.xz linux-dev-12d4ae9d998cf5b832b2387fc0d2b5b9efcdd322.zip | |
Merge branch 'mlx-next'
Or Gerlitz says:
====================
Mellanox NIC drivers update, June 23 2015
This series has two fixes from Eran to his recent SRIOV counters work in
mlx4 and few more updates from Saeed and Achiad to the mlx5 Ethernet
code. All fixes here relate to net-next code, so no need for -stable.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions