From: Linus Torvalds Date: Thu, 21 Apr 2011 16:58:42 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=83425eee85c6235392e3fe865faf533a48b60ab3;p=linux-beck.git 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 --- 83425eee85c6235392e3fe865faf533a48b60ab3