]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4dd7406 3979869)
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 13 Nov 2006 17:52:04 +0000 (09:52 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 13 Nov 2006 17:52:04 +0000 (09:52 -0800)
commit0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e
tree0e36f48f32c97c4ef9ed5fcd6158226345f43d2etree
parent4dd7406e9c7e7a5422425ef699780463490b8745commit | diff
parent39798695b4bcc7b145f8910ca56195808d3a7637commit | 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
Ubuntu Disco kernel mirror for Proxmox VE and PMG