diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-11-02 18:45:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-02 18:45:35 -0400 |
| commit | 202975b4c522c197e4e2269d389aafbf056a4c37 (patch) | |
| tree | 7bbb1b31963ffc9e539657ec7aae3415ca2ef204 /include/linux | |
| parent | vlan: use IS_ENABLED() (diff) | |
| parent | e1000: fix concurrent accesses to PHY from watchdog and ethtool (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to igb, ixgbe and e1000.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions