Merge branch 'sfc'
authorDavid S. Miller <davem@davemloft.net>
Tue, 21 Jan 2014 22:46:56 +0000 (14:46 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Jan 2014 22:46:56 +0000 (14:46 -0800)
commit3ea5ad27dc6791e2443c8a66fcdb04f180abf2ae
treed6402b968a3e49b5bc06213153efa2c66ddd5a26
parent6e6a50c254220acb19bd338ce433b1770e4a7a3c
parent13c92e82e821d87e388a73ffeddeb62d753dab96
Merge branch 'sfc'

Shradha Shah says:

====================
Bug Fixes for SFC driver

I am taking over the upstream patch submission work for the
sfc driver from Ben Hutchings.

These patches are bug fixes to the sfc driver involving
replacement of the PORT RESET MC command and fixing transposed
ptp_{under,over}size_sync_window_statistics

The PORT_RESET bug fix is needed for all versions supporting EF10
i.e all versions including and after 3.12.
====================

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