tree e97a28eb4c8c8440c3beef6a6ee0c3dc2c6a2938
parent 8ed54bd5657b75e654c5913bcc5c680485a531b6
parent afa2689e19073cd2e762d0f2c1358fab1ab9f18c
author Linus Torvalds <torvalds@linux-foundation.org> 1303405122 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1303405122 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  virtio: console: Enable call to hvc_remove() on console port remove
  virtio_pci: Prevent double-free of pci regions after device hot-unplug
  virtio: Decrement avail idx on buffer detach