]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 273466e 3664f59)
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)
commit3ca6aec1789c722ea8444e1fd733e4cc1eb1fa85
tree2f7b5fb7aafce3c70eecb3be409a22da72cbe0cetree | snapshot
parent273466ea2a5ba10fab0af16ef58de087b05f1cd2commit | diff
parent3664f595f21972f46d650713bd898dffa9392e8ccommit | 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.