Merge branch 'mlx4'
authorDavid S. Miller <davem@davemloft.net>
Thu, 17 Oct 2013 19:11:31 +0000 (15:11 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 17 Oct 2013 19:11:31 +0000 (15:11 -0400)
commit3a14aedec42c8c5998db24960cd797bd93f675f9
treec0de954cd9f65b6c6368215261992f0b7c3b7337
parentc1d607cc4a8ea1ef89d7f6f5728112bc5a52f2f6
parentb046ffe54dc13ff8ae918c83bedb71aa7919d63b
Merge branch 'mlx4'

Amir Vadai says:

====================
net/mlx4: Mellanox driver update 15-10-2013

This patchset contains small code cleaning patches, and a patch to make
mlx4_core use module_request() in order to load the relevant link layer module
(mlx4_en or mlx4_ib) according to the port type.
====================

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