tree c0de954cd9f65b6c6368215261992f0b7c3b7337
parent c1d607cc4a8ea1ef89d7f6f5728112bc5a52f2f6
parent b046ffe54dc13ff8ae918c83bedb71aa7919d63b
author David S. Miller <davem@davemloft.net> 1382037091 -0400
committer David S. Miller <davem@davemloft.net> 1382037091 -0400

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>