Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
commite55fdbd7414a3ee991d7081a256153f61ea98b9f
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 00:31:20 +0000 (20 16:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 00:31:20 +0000 (20 16:31 -0800)
tree252d30f5821bbb10d95a0c2d77cf21a7f4e7d5e3
parentc522682d7433d27461d631d03a2a1a3b741e9c91
parent8b3bb3ecf1934ac4a7005ad9017de1127e2fbd2f
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