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)
commitd291ffb3cf4f8f74b73bac77478c619251ee8a9f
tree65ac6eb9dd4113ab7ede46f873ed0b30faca8792
parent52e4c2a05256cb83cda12f3c2137ab1533344edb
parent72103bd1285211440621f2c46f4fce377584de54
Merge git://github.com/rustyrussell/linux

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