diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-06 12:27:34 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-06 12:27:34 -0700 |
commit | 4c844d97d269a7ec4a6ba7d530aa876ac64dfb76 (patch) | |
tree | 67198ffbe0d8652f9a26548a7435f7514912a8cc /drivers/net/qlcnic/qlcnic_main.c | |
parent | tg3: Support 4mb flash sizes for 5717 and 5719 (diff) | |
parent | sfc: Implement ethtool_ops::set_phys_id instead of ethtool_ops::phys_id (diff) | |
download | linux-dev-4c844d97d269a7ec4a6ba7d530aa876ac64dfb76.tar.xz linux-dev-4c844d97d269a7ec4a6ba7d530aa876ac64dfb76.zip |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
Diffstat (limited to 'drivers/net/qlcnic/qlcnic_main.c')
0 files changed, 0 insertions, 0 deletions