projects / sdk / emulator / emulator-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3f96a53 a915ccc)
Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 Sep 2013 01:42:37 +0000 (21:42 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Sep 2013 01:43:54 +0000 (21:43 -0400)
commit1ef68ec462571955f2a667ddf1ffe279848709d7
tree8879bdadfaea06316cbaa0eb1583806ce45d2cc0tree | snapshot
parent3f96a532113131d5a65ac9e00fc83cfa31b0295fcommit | diff
parenta915ccc9f2c80aa4c329262d89f93ea16d8792c9commit | diff
Merge branch 'sfc-3.12' of git://git./linux/kernel/git/bwh/sfc

Ben Hutchings says:

====================
Some bug fixes and future-proofing for the recently added SFC9120
support:

1. Minimal support for the 40G configuration.
2. Disable the incomplete PTP/hardware timestamping support.
3. Reset MAC stats properly after a firmware upgrade.
4. Re-check the datapath firmware capabilities after the controller is
reset.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Domain: SDK / Emulator;