aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2007-01-09 09:36:06 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-09 09:36:06 -0800
commit97bee8e25da4dfc3b7a369fb2c2f280f5c1918c2 (patch)
tree75dcf606ca1c29bd3aca571834355ccf6f06bd5b /drivers/net/bnx2.c
parent8ba1f2798224086c72c1132acd6fdb45068279d7 (diff)
parent77aab8bf22042d1658d4adbca8b71779e7f2d0ff (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: pcnet_cs : add new id chelsio: error path fix s390: iucv Kconfig help description changes s390: qeth driver fixes: atomic context fixups s390: qeth driver fixes: packet socket s390: qeth driver fixes: VLAN hdr, perf stats forcedeth: sideband management fix Revert "[PATCH] e1000: disable TSO on the 82544 with slab debugging" qeth: fix uaccess handling and get rid of unused variable qla3xxx: Add delay to NVRAM register access. qla3xxx: Remove NETIF_F_LLTX from driver features. ixgb: Write RA register high word first, increment version ixgb: Maybe stop TX if not enough free descriptors ixgb: Fix early TSO completion [PATCH] ipw2100: Fix dropping fragmented small packet problem [PATCH] ieee80211: WLAN_GET_SEQ_SEQ fix (select correct region)
Diffstat (limited to 'drivers/net/bnx2.c')
0 files changed, 0 insertions, 0 deletions