From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 13 Nov 2006 17:52:04 +0000 (-0800)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: v3.12-rc1~31920^2~20^2~130
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e;p=kernel%2Fkernel-generic.git

Merge branch 'for-linus' of /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
---

0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e