From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Sep 2013 22:16:15 +0000 (-0700)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Tag: firefly_0821_release~176^2~5268
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d45004f9947e521fc9e812bc7937ed6e0328793b;p=firefly-linux-kernel-4.4.55.git

Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull vhost updates from Michael Tsirkin:
 "vhost: minor changes on top of 3.12-rc1

  This fixes module loading for vhost-scsi, and tweaks locking in vhost
  core a bit.  Both of these are not exactly release blockers but it's
  early in the cycle so I think it's a good idea to apply them now"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost-scsi: whitespace tweak
  vhost/scsi: use vmalloc for order-10 allocation
  vhost: wake up worker outside spin_lock
---

d45004f9947e521fc9e812bc7937ed6e0328793b