Merge tag 'for-linus' of git://github.com/rustyrussell/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Feb 2012 23:14:33 +0000 (15:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Feb 2012 23:14:33 +0000 (15:14 -0800)
commitd7e53922aa47b7a5a91bc34da00348e6ee0ed242
tree722dc7b341ae597ded46eedcf6e75456a72c6dea
parentc5f2ac92c69c64ea303a7b28b17143fbf601182d
parent4eb05d562ea1ea34ff607aa877aefbf05b21c140
Merge tag 'for-linus' of git://github.com/rustyrussell/linux

Merge virtio pull request from Rusty Russell.

* tag 'for-linus' of git://github.com/rustyrussell/linux:
  virtio: balloon: leak / fill balloon across S4