tree fdfffa99cc31f94e8780fa255a4a79ccc0785897
parent 9becd707841207652449a8dfd90fe9c476d88546
parent 83d3459a5928f18c9344683e31bc2a7c3c25562a
author David S. Miller <davem@davemloft.net> 1399319369 -0400
committer David S. Miller <davem@davemloft.net> 1399319369 -0400

Merge branch 'mlx4'

Or Gerlitz says:

====================
This series contains fixes for 3.15-rc, mostly around SRIOV. The patches by Jack,
Matan and myself fix few issues related to mlx4 SRIOV support for RoCE and single
port VFs, and the patch from Eyal eliminates checking PCI caps for VFs which is misleading.

Patches done against the net tree, commit 014f1b2 "net: bonding: Fix format string
mismatch in bond_sysfs.c"

We'd be happy to get Eyal's patch queued in your -stable list for 3.14.y
====================

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