diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-06-11 00:32:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-11 00:32:53 -0700 |
| commit | 7e1a61b6c14e7b0816b800038781b9572d5154d4 (patch) | |
| tree | e284410c5e97c58174afd8e1d9ee259419e5ebcb /drivers/net/wan/farsync.c | |
| parent | net: wimax: i2400m: control.c: Cleaning up conjunction always evaluates to false (diff) | |
| parent | net/mlx4_core: Keep only one driver entry release mlx4_priv (diff) | |
| download | linux-dev-7e1a61b6c14e7b0816b800038781b9572d5154d4.tar.xz linux-dev-7e1a61b6c14e7b0816b800038781b9572d5154d4.zip | |
Merge branch 'mlx4'
Or Gerlitz says:
====================
mlx4 SRIOV fixes
The patch from Wei Yang is a designed fix to a regression introduced by earlier commit
of him. Jack added a fix to the resource management which we got from IBM.
Let's get that into 3.16-rc1 1st and later see to what stable version/s this should go.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan/farsync.c')
0 files changed, 0 insertions, 0 deletions