diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-18 14:12:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-18 14:12:11 -0500 |
| commit | a16af2ffa2f640f094a3ad3543996a37b588a3cc (patch) | |
| tree | dc9a5126db710cbfa0cada18f20acec42495b7b7 /drivers/net/usb/asix.h | |
| parent | 887c95cc1da53f66a5890fdeab13414613010097 (diff) | |
| parent | ba59814b39b7ec674f604b0f9b35f1773f2fbf1a (diff) | |
Merge branch 'intel'
Jeff Kirsher says:
====================
This series contains updates to e1000e and igb. Most notably is the
added timestamp support in e1000e and additional software timestamp
support in igb. As well as, the added thermal data support and SR-IOV
configuration support in igb.
v2- dropped the following patches from the previous 14 patch series
because changes were requested from the community:
e1000e: add support for IEEE-1588 PTP
igb: Report L4 Rx hash via skb->l4_rxhash
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/asix.h')
0 files changed, 0 insertions, 0 deletions