Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Jan 2014 06:24:35 +0000 (22:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Jan 2014 06:24:35 +0000 (22:24 -0800)
commit93b05cba8ed52a751da9c4c7da6c97bc514bec77
tree7768ff8c9abfe54b1ac9f6c6ecb2e5c0f91ed507
parent84621c9b18d0bb6cb267e3395c7f3131ecf4d39c
parent05c54de8c88c02bd0a44de8316d5e276b856632e
Merge tag 'virtio-next-for-linus' of git://git./linux/kernel/git/rusty/linux

Pull virtio update from Rusty Russell:
 "A few simple fixes.  Quiet cycle"

* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  drivers: virtio: Mark function virtballoon_migratepage() as static in virtio_balloon.c
  virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze
  virtio: pci: remove unnecessary pci_set_drvdata()
drivers/virtio/virtio_balloon.c