| commit | 1bc693e18a0b279a8b1d174485750601f3f44d7b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Mar 02 19:06:49 2014 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Sun Mar 02 19:06:49 2014 -0500 |
| tree | 2f7b5fb7aafce3c70eecb3be409a22da72cbe0ce | |
| parent | 285727600fa3714051cda1c21f20a8a3842f3dd8 [diff] | |
| parent | 93501d48b887ee3e032c66ee2e11706497223842 [diff] |
Merge branch 'intel-next' Aaron Brown says: ==================== Mark updates ixgbe for LER / adapter removal. He restores the HW address in the recovery path so the device is not perpetually removed, fixes up some removed state ethtool results and adds checks related to config space access. Jacob adds support for the new SIOCGHWTSTAMP ioctl. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>