From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Jan 2012 20:37:27 +0000 (-0800)
Subject: Merge tag 'to-linus' of git://github.com/rustyrussell/linux
X-Git-Tag: firefly_0821_release~3680^2~3737
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=bcf8a3dfcb274cf6654a19e12e244f3af8c0d355;p=firefly-linux-kernel-4.4.55.git

Merge tag 'to-linus' of git://github.com/rustyrussell/linux

* tag 'to-linus' of git://github.com/rustyrussell/linux: (24 commits)
  lguest: Make sure interrupt is allocated ok by lguest_setup_irq
  lguest: move the lguest tool to the tools directory
  lguest: switch segment-voodoo-numbers to readable symbols
  virtio: balloon: Add freeze, restore handlers to support S4
  virtio: balloon: Move vq initialization into separate function
  virtio: net: Add freeze, restore handlers to support S4
  virtio: net: Move vq and vq buf removal into separate function
  virtio: net: Move vq initialization into separate function
  virtio: blk: Add freeze, restore handlers to support S4
  virtio: blk: Move vq initialization to separate function
  virtio: console: Disable callbacks for virtqueues at start of S4 freeze
  virtio: console: Add freeze and restore handlers to support S4
  virtio: console: Move vq and vq buf removal into separate functions
  virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff
  virtio: pci: switch to new PM API
  virtio_blk: fix config handler race
  virtio: add debugging if driver doesn't kick.
  virtio: expose added descriptors immediately.
  virtio: avoid modulus operation.
  virtio: support unlocked queue kick
  ...
---

bcf8a3dfcb274cf6654a19e12e244f3af8c0d355