diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 13:40:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 13:40:22 -0700 |
| commit | bd381934bf13ccb1af2813ae26c6fe00ec85d254 (patch) | |
| tree | 5275ba0640014793b1b81d52312a581384c335d3 /drivers/net/bonding | |
| parent | cc9b0b9bea9a0057840261204a6e01c7e19d444c (diff) | |
| parent | 335f2d1b24a350ca8099aea6db5b7adc73666d2f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
RDMA/addr: Fix resolution of local IPv6 addresses
RDMA/cxgb3: Handle NULL inetdev pointer in iwch_query_port()
mlx4_core: Add 40GigE device ID
RDMA/iwcm: Don't call provider reject func with irqs disabled
IB: Fix typo in udev rule documentation
Diffstat (limited to 'drivers/net/bonding')
0 files changed, 0 insertions, 0 deletions