tree 61dbcee09d925a839b34df3b8149e26972dc5402
parent 2442d3109943bafbdfc4f0495e3d10eeedc8390c
parent b45bfcc1ae084aa98c0350b8c33c8b57540b0acc
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1170802533 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1170802533 -0800

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/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>