From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Apr 2009 17:58:20 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio
X-Git-Tag: v2.6.30-rc3~45
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio:
  lguest: document 32-bit and PAE requirements
  lguest: tell git to ignore Documentation/lguest/lguest
  virtio: fix suspend when using virtio_balloon
  lguest: fix guest crash on non-linear addresses in gdt pvops
  lguest: fix crash on vmlinux images
---

d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a