commit 6bd113f1f4a8c0d05c4dbadb300319e0e3526db4
author Linus Torvalds <torvalds@linux-foundation.org> Tue Feb 07 14:35:19 2012 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Feb 07 14:35:19 2012 -0800
tree f357b1130950d8de320885810eb27fe574f6ebf5
parent 95025d6b27721ae8bbce592403fdc06e982204c8
parent 715252d41912941efb791a7b7bad94d2614dc5c3

Merge tag 'ib-srpt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

Cleanups and error path fixes for the new SRP (SCSI RDMA protocol) target.

* tag 'ib-srpt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/srpt: Don't return freed pointer from srpt_alloc_ioctx_ring()
  IB/srpt: Fix ERR_PTR() vs. NULL checking confusion
  IB/srpt: Remove unneeded <linux/version.h> include
  IB/srpt: Use ARRAY_SIZE() instead of open-coding
  IB/srpt: Use DEFINE_SPINLOCK()/LIST_HEAD()