tree 65ac6eb9dd4113ab7ede46f873ed0b30faca8792
parent 52e4c2a05256cb83cda12f3c2137ab1533344edb
parent 72103bd1285211440621f2c46f4fce377584de54
author Linus Torvalds <torvalds@linux-foundation.org> 1321250401 -0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1321250401 -0200

Merge git://github.com/rustyrussell/linux

* git://github.com/rustyrussell/linux:
  virtio-pci: fix use after free