diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-05-05 02:24:42 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-05-05 02:27:03 -0400 |
| commit | f99e44a7f3352d7131c7526207f153f13ec5acd4 (patch) | |
| tree | 0f448b21128c478053ee7f7765b865954c4eebe8 /Documentation/virtual/00-INDEX | |
| parent | fd29f424d458118f02e89596505c68a63dcb3007 (diff) | |
| parent | ce857229e0c3adc211944a13a5579ef84fd7b4af (diff) | |
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-INDEX | 3 |
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/ | |||
| 6 | - Kernel Virtual Machine. See also http://linux-kvm.org | 6 | - Kernel Virtual Machine. See also http://linux-kvm.org |
| 7 | uml/ | 7 | uml/ |
| 8 | - User Mode Linux, builds/runs Linux kernel as a userspace program. | 8 | - User Mode Linux, builds/runs Linux kernel as a userspace program. |
| 9 | virtio.txt | ||
| 10 | - Text version of draft virtio spec. | ||
| 11 | See http://ozlabs.org/~rusty/virtio-spec | ||