summaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x_main.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-05 15:09:05 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-05 15:09:05 -0700
commit2861a185e3ac2ebe5958a2039b66062445bf4f7d (patch)
tree535546ba778348477c95cb781677432a2bc831c9 /drivers/net/bnx2x_main.c
parentec7d2f2cf3a1b76202986519ec4f8ec75b2de232 (diff)
parent83163244f845c296a118ce85c653872dbff6abfe (diff)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/bnx2x_main.c')
0 files changed, 0 insertions, 0 deletions