summaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x_link.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-23 13:35:04 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-23 13:35:04 -0700
commit8be7cdccacfbfc707e7370cad9bb168defed636f (patch)
tree8416607b62ec352176c81afd6f4e7b571ceb957f /drivers/net/bnx2x_link.h
parentecd4137320b59759bbe57eef89040ee3e5e66039 (diff)
parent61fa9dcf9329cb92c220f7b656410fbe5e72f933 (diff)
downloadlinux-8be7cdccacfbfc707e7370cad9bb168defed636f.tar.gz
linux-8be7cdccacfbfc707e7370cad9bb168defed636f.tar.bz2
linux-8be7cdccacfbfc707e7370cad9bb168defed636f.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/ucc_geth.c
Diffstat (limited to 'drivers/net/bnx2x_link.h')
0 files changed, 0 insertions, 0 deletions