summaryrefslogtreecommitdiff
path: root/Documentation/virtual/00-INDEX
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-05-05 10:24:42 +0400
committerThomas Gleixner <tglx@linutronix.de>2013-05-05 10:27:03 +0400
commitf99e44a7f3352d7131c7526207f153f13ec5acd4 (patch)
tree0f448b21128c478053ee7f7765b865954c4eebe8 /Documentation/virtual/00-INDEX
parentfd29f424d458118f02e89596505c68a63dcb3007 (diff)
parentce857229e0c3adc211944a13a5579ef84fd7b4af (diff)
downloadlinux-f99e44a7f3352d7131c7526207f153f13ec5acd4.tar.xz
Merge branch 'linus' into core/urgent
Update with Linus tree so fixes for the same can be applied. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation/virtual/00-INDEX')
-rw-r--r--Documentation/virtual/00-INDEX3
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/virtual/00-INDEX b/Documentation/virtual/00-INDEX
index 924bd462675e..e952d30bbf0f 100644
--- a/Documentation/virtual/00-INDEX
+++ b/Documentation/virtual/00-INDEX
@@ -6,6 +6,3 @@ kvm/
- Kernel Virtual Machine. See also http://linux-kvm.org
uml/
- User Mode Linux, builds/runs Linux kernel as a userspace program.
-virtio.txt
- - Text version of draft virtio spec.
- See http://ozlabs.org/~rusty/virtio-spec