Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jan 2012 00:29:42 +0000 (16:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jan 2012 00:29:42 +0000 (16:29 -0800)
* 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  ib_srpt: Initial SRP Target merge for v3.3-rc1


Trivial merge