diff options
author | 2012-02-24 13:23:23 +0900 | |
---|---|---|
committer | 2012-02-24 13:23:23 +0900 | |
commit | 35eb304b5cd7b49d581bda79218b8134f3b689ea (patch) | |
tree | 3d75d9ada70814161d035b2f9166fee05d257dfb /Documentation/virtual/00-INDEX | |
parent | Merge branch 'rmobile/urgent' into rmobile-fixes-for-linus (diff) | |
parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
download | linux-dev-35eb304b5cd7b49d581bda79218b8134f3b689ea.tar.xz linux-dev-35eb304b5cd7b49d581bda79218b8134f3b689ea.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-fixes-for-linus
Diffstat (limited to 'Documentation/virtual/00-INDEX')
-rw-r--r-- | Documentation/virtual/00-INDEX | 2 |
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 |