From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Sep 2009 16:23:45 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
X-Git-Tag: v2.6.32-rc1~175
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1f0918d03ff4b5c94540c71ce889672abdbc2f4a;p=linux-2.6-block.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  lguest: don't force VIRTIO_F_NOTIFY_ON_EMPTY
  lguest: cleanup for map_switcher()
  lguest: use PGDIR_SHIFT for PAE code to allow different PAGE_OFFSET
  lguest: use set_pte/set_pmd uniformly for real page table entries
  lguest: move panic notifier registration to its expected place.
  virtio_blk: add support for cache flush
  virtio: add virtio IDs file
  virtio: get rid of redundant VIRTIO_ID_9P definition
  virtio: make add_buf return capacity remaining
  virtio_pci: minor MSI-X cleanups
---

1f0918d03ff4b5c94540c71ce889672abdbc2f4a