]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'mlx4'
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Jun 2014 07:32:53 +0000 (00:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Jun 2014 07:32:53 +0000 (00:32 -0700)
commitcf03acf8305f341107dd4f8cd1970c21d68d0317
treee284410c5e97c58174afd8e1d9ee259419e5ebcb
parent5410fef88a5342aabfc97e16c4899121ae0a667b
parente224f62595c5f9a56b58412dedb387e8915c8c0f
Merge branch 'mlx4'

Or Gerlitz says:

====================
mlx4 SRIOV fixes

The patch from Wei Yang is a designed fix to a regression introduced by earlier commit
of him. Jack added a fix to the resource management which we got from IBM.

Let's get that into 3.16-rc1 1st and later see to what stable version/s this should go.
====================

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