aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-28 18:16:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-28 18:16:09 -0800
commite3b8369ca8f2fd756031dd972224bc70c2364ec2 (patch)
treebd4bab77912008a9f112b487616e08a74682f59b /Documentation
parent6c334f4f6aeb0916bfc15ff731073e9f24de0189 (diff)
parent13289d5f2b2ee73583e6c65c46a1e0cd48c3ddc0 (diff)
downloadlinux-linaro-stable-e3b8369ca8f2fd756031dd972224bc70c2364ec2.tar.gz
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
* tag 'for-linus' of git://github.com/rustyrussell/linux: lguest: remove reference from Documentation/virtual/00-INDEX virtio: correct the memory barrier in virtqueue_kick_prepare() virtio: fix typos of memory barriers
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/virtual/00-INDEX2
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/virtual/00-INDEX b/Documentation/virtual/00-INDEX
index 8e601991d91c..924bd462675e 100644
--- a/Documentation/virtual/00-INDEX
+++ b/Documentation/virtual/00-INDEX
@@ -4,8 +4,6 @@ Virtualization support in the Linux kernel.
- this file.
kvm/
- Kernel Virtual Machine. See also http://linux-kvm.org
-lguest/
- - Extremely simple hypervisor for experimental/educational use.
uml/
- User Mode Linux, builds/runs Linux kernel as a userspace program.
virtio.txt