projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2857276 93501d4)
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)
commit1bc693e18a0b279a8b1d174485750601f3f44d7b
tree2f7b5fb7aafce3c70eecb3be409a22da72cbe0cetree | snapshot
parent285727600fa3714051cda1c21f20a8a3842f3dd8commit | diff
parent93501d48b887ee3e032c66ee2e11706497223842commit | 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>
John Crispins staging tree