diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-12-05 09:29:56 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-12-05 09:29:56 -0500 |
commit | aa489f0f268595bd33d9649030bd1a43c28927a0 (patch) | |
tree | 598cb96d4b22749e07116cb4006d71fb5a5704ea /drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c | |
parent | Merge branch 'cxgb4' (diff) | |
parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (diff) | |
download | linux-dev-aa489f0f268595bd33d9649030bd1a43c28927a0.tar.xz linux-dev-aa489f0f268595bd33d9649030bd1a43c28927a0.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c')
0 files changed, 0 insertions, 0 deletions