Merge git://github.com/rustyrussell/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Nov 2011 06:00:01 +0000 (04:00 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Nov 2011 06:00:01 +0000 (04:00 -0200)
* git://github.com/rustyrussell/linux:
  virtio-pci: fix use after free


Trivial merge