diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-12 15:24:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-12 15:24:06 -0700 |
| commit | 2e9f0e18678ffb2a932390e12de88b2b31c465b6 (patch) | |
| tree | 88542c04904f978fe34e69cecfd5e85686c21c4d /drivers/infiniband/ulp/ipoib/ipoib_vlan.c | |
| parent | 6762b47a74264152eeda5ac7516732fe9be265a7 (diff) | |
| parent | c91e468a48a2afd2a2b0c2e29a35d6b8c51ea682 (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:
[PATCH] Use pci_set_consistent_dma_mask in ixgb driver
[PATCH] sky2: bad memory reference on dual port cards
[PATCH] mv643xx_eth: Fix tx_timeout to only conditionally wake tx queue
[PATCH] mv643xx_eth: Always free completed tx descs on tx interrupt
[PATCH] net drivers: fix section attributes for gcc
[PATCH] remove drivers/net/hydra.h
[PATCH] drivers/net/via-rhine.c: make a function static
[netdrvr b44] trim trailing whitespace
[PATCH] b44: increase version to 1.00
[PATCH] b44: disable default tx pause
[PATCH] via-rhine: execute bounce buffers code on Rhine-I only
[PATCH] network: axnet_cs.c: add missing 'PRIV' in ei_rx_overrun
[PATCH] dlink pci cards using wrong driver
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_vlan.c')
0 files changed, 0 insertions, 0 deletions