Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Aug 2012 05:40:51 +0000 (08:40 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Aug 2012 05:40:51 +0000 (08:40 +0300)
Pull tcm_vhost level target fabric driver from Nicholas Bellinger:
 "Here is the PULL request for the initial merge of tcm_vhost based on
  RFC-v5 code with MST's ACK appended to the initial merge commit."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  tcm_vhost: Initial merge for vhost level target fabric driver


Trivial merge