]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cbbc837 9acbf4b)
Merge branch 'intel-next'
authorDavid S. Miller <davem@davemloft.net>
Mon, 3 Mar 2014 00:06:49 +0000 (19:06 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 Mar 2014 00:06:49 +0000 (19:06 -0500)
commitd7238ac07bea298fb4f45ea54920d0d25a9aa482
tree2f7b5fb7aafce3c70eecb3be409a22da72cbe0cetree | snapshot
parentcbbc837b9f5c0bce09bbf9f4459d7d58c40e62c8commit | diff
parent9acbf4b42b82a88814cae9daf893ebf2869f298acommit | 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>
Linux Kernel Source Tree.