From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Jun 2014 12:30:20 +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~3703
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=07f4695c62629a7035583ebc344e8b2a8953d61c;p=firefly-linux-kernel-4.4.55.git

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

Pull vhost cleanups from Michael S Tsirkin:
 "Two cleanup patches removing code duplication that got introduced by
  changes in rc1.  Not fixing crashes, but I'd rather not carry the
  duplicate code until the next merge window"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost-scsi: don't open-code kvfree
  vhost-net: don't open-code kvfree
---

07f4695c62629a7035583ebc344e8b2a8953d61c