]> Git Repo - linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
authorLinus Torvalds <[email protected]>
Fri, 21 Jan 2011 00:31:20 +0000 (16:31 -0800)
committerLinus Torvalds <[email protected]>
Fri, 21 Jan 2011 00:31:20 +0000 (16:31 -0800)
* 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


Trivial merge
This page took 0.054272 seconds and 4 git commands to generate.