From: David S. Miller <davem@davemloft.net>
Date: Thu, 22 May 2014 21:17:34 +0000 (-0400)
Subject: Merge branch 'mlx4-next'
X-Git-Tag: v3.16-rc1~27^2~154
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=091b64868b43ed84334c6623ea6a08497529d4ff;p=linux.git

Merge branch 'mlx4-next'

Amir Vadai says:

====================
net/mlx4_core: Deprecate module parameter use_prio

This small patchset deprecates the mlx4_core module paramater 'use_prio', as
suggested by Carol Soto from IBM in [1].
Also, replaced some calls to the prefered pr_warn/info/devel macro's.

Patchset was applied and tested on commit b6052af: "Merge tag
'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge"

[1] - http://marc.info/?l=linux-netdev&m=139871350103432&w=2
====================

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

091b64868b43ed84334c6623ea6a08497529d4ff