From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Feb 2012 22:35:19 +0000 (-0800)
Subject: Merge tag 'ib-srpt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6bd113f1f4a8c0d05c4dbadb300319e0e3526db4;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'ib-srpt-fixes' of git://git./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()
---

6bd113f1f4a8c0d05c4dbadb300319e0e3526db4