Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio
commitd91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 Apr 2009 17:58:20 +0000 (19 10:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 Apr 2009 17:58:20 +0000 (19 10:58 -0700)
treec0bb21ec3474a5e3f6f25fa45139fec22f7e8575
parentaf8f937274437fa81b95e4e2d461460220636cb8
parent38cfe968040250b89c3554a17219a9fda45b9665
Merge git://git./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