From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 6 Feb 2007 22:55:33 +0000 (-0800)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: v3.12-rc1~31390^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c7d3757116c59b3eedd9aa6dfd7ae0a1341f5c2;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/ehca: Remove obsolete prototypes
  IB/ehca: Remove use of do_mmap()
  RDMA/addr: Handle ethernet neighbour updates during route resolution
  IB: Make sure struct ib_user_mad.data is aligned
  IB/srp: Don't wait for response when QP is in error state.
  IB: Return qp pointer as part of ib_wc
  IB: Include <linux/kref.h> explicitly in <rdma/ib_verbs.h>
---

0c7d3757116c59b3eedd9aa6dfd7ae0a1341f5c2