From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Oct 2009 22:35:16 +0000 (+0900)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
X-Git-Tag: v2.6.32-rc6~113
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=964fe080d94db82a3268443e9b9ece4c60246414;p=users%2Fdwmw2%2Flinux.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:
  move virtrng_remove to .devexit.text
  move virtballoon_remove to .devexit.text
  virtio_blk: Revert serial number support
  virtio: let header files include virtio_ids.h
  virtio_blk: revert QUEUE_FLAG_VIRT addition
---

964fe080d94db82a3268443e9b9ece4c60246414