From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Jul 2009 15:53:41 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
X-Git-Tag: v2.6.31-rc4~33
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=301d95c4dade09388f94258ee797d2d650dc00b5;p=~shefty%2Frdma-dev.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_net: Sync header with qemu
  virtio-pci: correctly unregister root device on error
  virtio_blk: ioctl return value fix
  virtio_blk: don't bounce highmem requests
  lguest: restrict CPUID to avoid perf counter wrmsr
  lguest: remove unnecessary forward struct declaration
  lguest: fix journey
---

301d95c4dade09388f94258ee797d2d650dc00b5