Merge branch 'mlx4'
authorDavid S. Miller <davem@davemloft.net>
Fri, 8 Nov 2013 00:22:54 +0000 (19:22 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Nov 2013 00:22:54 +0000 (19:22 -0500)
commite21dd863acec8d3bc5166fb2a0c680a9982b37db
tree8d328edce3828c60e80989267eb7594d2d7e24d6
parent3cdcf1334cd76bbcabd0f273ee9a13e4cc7816bc
parent163561a4e2f8af44e96453bc10c7a4f9bcc736e1
Merge branch 'mlx4'

Amir Vadai says:

====================
net/mlx4: Mellanox driver update 07-11-2013

This patchset contains some enhancements and bug fixes for the mlx4_* drivers.
Patchset was applied and tested against commit: "9bb8ca8 virtio-net: switch to
use XPS to choose txq"
====================

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