diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-17 15:11:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-17 15:11:31 -0400 |
| commit | 3a14aedec42c8c5998db24960cd797bd93f675f9 (patch) | |
| tree | c0de954cd9f65b6c6368215261992f0b7c3b7337 /drivers/misc/sgi-xp | |
| parent | c1d607cc4a8ea1ef89d7f6f5728112bc5a52f2f6 (diff) | |
| parent | b046ffe54dc13ff8ae918c83bedb71aa7919d63b (diff) | |
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>
Diffstat (limited to 'drivers/misc/sgi-xp')
0 files changed, 0 insertions, 0 deletions