From: David S. Miller <davem@davemloft.net>
Date: Tue, 21 Jan 2014 22:46:56 +0000 (-0800)
Subject: Merge branch 'sfc'
X-Git-Tag: v3.14-rc1~94^2~68
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ea5ad27dc6791e2443c8a66fcdb04f180abf2ae;p=pandora-kernel.git

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>
---

3ea5ad27dc6791e2443c8a66fcdb04f180abf2ae
Reading git-diff-tree failed