tree ecee710444fb3405da55933501e339e10e4ac880
parent 4266c97a3ef4604561a22212eb0eab8a3c338971
parent ca60a42c9be41c07ebcc2ec8c43dd1be53f147bf
author Linus Torvalds <torvalds@linux-foundation.org> 1253723025 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253723025 -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:
  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