From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jan 2011 00:31:20 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
X-Git-Tag: firefly_0821_release~7613^2~2636
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e55fdbd7414a3ee991d7081a256153f61ea98b9f;p=firefly-linux-kernel-4.4.55.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:
  virtio: remove virtio-pci root device
  LGUEST_GUEST: fix unmet direct dependencies (VIRTUALIZATION && VIRTIO)
  lguest: compile fixes
  lguest: Use this_cpu_ops
  lguest: document --rng in example Launcher
  lguest: example launcher to use guard pages, drop PROT_EXEC, fix limit logic
  lguest: --username and --chroot options
---

e55fdbd7414a3ee991d7081a256153f61ea98b9f