Merge branch 'mlx4-net'

Browse source

Or Gerlitz says:

====================
mlx4 driver fixes for 3.19-rc2

Please push Maor's patch to -stable >= 3.17

Jack's fixes error-flow issues introduced in 3.19-rc1, no need for -stable.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2015-01-02 15:41:33 -05:00

parent 7824acd924 d0d012509f

commit 2b972acbe5

2 changed files with 9 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

13

drivers/net/ethernet/mellanox/mlx4/main.c

View file

9

drivers/net/ethernet/mellanox/mlx4/mr.c

View file