OSDN Git Service

Merge branch 'qlcnic-next'
authorDavid S. Miller <davem@davemloft.net>
Sat, 30 Aug 2014 03:15:42 +0000 (20:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 30 Aug 2014 03:15:42 +0000 (20:15 -0700)
commit879ece6ecb2107ef1bbc3332cb2fea54c7d3a636
treee47b74db9e3286139010d853affab0022c249c2a
parent10c51b56232d24f150e39884a9e749fd99cbc60c
parent07fbc6b79f63ae2a3e6afb88ec1b18abbf0430a0
Merge branch 'qlcnic-next'

Shahed Shaikh says:

====================
qlcnic: Feature addition and enhancements

This series contains following feature addition and enhancements,
- Update Link speed and Port type information for 83xx series adapters
- Support 0x8830 device ID
- Support for Power on Self Test (POST) feature for 83xx
- Use usleep_range() instead of msleep() for values less than 20ms
====================

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