diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-15 14:50:09 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-15 14:50:09 -0700 |
commit | d87f4fe2121a017241e495fedc0a79d0dec05a92 (patch) | |
tree | e7ef9628bb8240dc8ea69f7af027fdefdc2b549c /drivers/net/netxen/netxen_nic_ethtool.c | |
parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 (diff) | |
parent | igb: Add messaging for thermal sensor events on i350 devices (diff) | |
download | linux-dev-d87f4fe2121a017241e495fedc0a79d0dec05a92.tar.xz linux-dev-d87f4fe2121a017241e495fedc0a79d0dec05a92.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/netxen/netxen_nic_ethtool.c')
0 files changed, 0 insertions, 0 deletions