OSDN Git Service

Merge branch 'mlx5-next'
authorDavid S. Miller <davem@davemloft.net>
Wed, 30 Jul 2014 21:00:11 +0000 (14:00 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Jul 2014 21:00:11 +0000 (14:00 -0700)
commit7aa06bf57bb633681e11c06c85604ad014910d55
tree3aa6153ee27defc59d6223fdb23f4d95460eddb3
parent4ada97abe937cdb3fc029a871d5b0f21aa661a60
parent4d2f9bbb654b91a262638ac2c84dcb169d014aa6
Merge branch 'mlx5-next'

Eli Cohen says:

====================
mlx5 driver changes related to PCI handling ***

The first of these patches is changing the pci device driver from mlx5_ib to
mlx5_core in a similar manner it is done in mlx4. This set the grounds for us
to introduce Ethernet driver for HW which uses mlx5.

The other two patches contain minor fixes.
====================

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