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)
Merge virtio pull request from Rusty Russell.

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


Trivial merge