| commit | 0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Nov 13 09:52:04 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Nov 13 09:52:04 2006 -0800 |
| tree | 0e36f48f32c97c4ef9ed5fcd6158226345f43d2e | |
| parent | 4dd7406e9c7e7a5422425ef699780463490b8745 [diff] | |
| parent | 39798695b4bcc7b145f8910ca56195808d3a7637 [diff] |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/mad: Fix race between cancel and receive completion RDMA/amso1100: Fix && typo RDMA/amso1100: Fix unitialized pseudo_netdev accessed in c2_register_device IB/ehca: Activate scaling code by default IB/ehca: Use named constant for max mtu IB/ehca: Assure 4K alignment for firmware control blocks