Merge branch 'sfc-next'
authorDavid S. Miller <davem@davemloft.net>
Wed, 13 May 2015 19:11:52 +0000 (15:11 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 May 2015 19:11:52 +0000 (15:11 -0400)
Edward Cree says:

====================
sfc: Bowdlerise PTP MCDI errors

When the NIC doesn't support PTP, probe-time MCDI commands fail in
predictable ways.  Instead of logging cryptic MCDI errors, just log that
PTP isn't supported.

v2: Hopefully stop Thunderbird mangling the patches.
====================

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

Trivial merge