summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-01-02 15:41:33 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-02 15:41:33 -0500
commit2b972acbe5dccbba0e6dc74b51b3d4cfb2f11e5c (patch)
tree21c623ec85ad80b7c88c5986972c1d519112eb05 /net
parent7824acd92494cf21229ea5313e525fa20927ba26 (diff)
parentd0d012509f2ecee9af1857ccacac33b2266c6ce8 (diff)
Merge branch 'mlx4-net'
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>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions