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)
commitf59e842fc0871cd5baa213dc32e0ce8e5aaf4758
tree5fc24fe6bc8e49d9d939485f3804a7ef977254c0
parent4ba3069fea9f0771dad3f4906b305ab50d5a1b30
parenta42d985bd5b234da8b61347a78dc3057bf7bb94d
Merge branch 'for-next-merge' of git://git./linux/kernel/git/nab/target-pending

* '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