diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-27 19:06:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-27 19:06:42 -0500 |
| commit | 6efecd8c51c0118038495a5e10a0d855938da9ad (patch) | |
| tree | c49ab01f3a85c8fa2ccbd1cb4ac0961b62bcd298 /net/irda | |
| parent | 031554eab078705edb96e9a39665597e3fd22781 (diff) | |
| parent | 70806a7fd1ae8942675bb2d415899e9e64440505 (diff) | |
Merge branch 'intel'
Jeff Kirsher says:
====================
This series contains updates to e1000e only. All the updates come
from Bruce Allan and most of the patch fix or enable features on
i217/i218. Most notably is patch 03 "e1000e: add support for IEEE-1588
PTP", which is v2 of the patch based on feedback from Stephen Hemminger.
Also patch 04 "e1000e: enable ECC on I217/I218 to catch packet buffer
memory errors" should be queued up for stable (as well as net) trees, but
the patch does not apply cleanly to either of those trees currently.
So I will work with Bruce to provide a version of the patch which will
apply cleanly to net (and stable) and we can queue it up at that point
for stable 3.5 tree.
The remaining patches are general cleanups of the code.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda')
0 files changed, 0 insertions, 0 deletions