Commit 7663164f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs 

* 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
  Correct occurrences of - Documentation/kvm/ to Documentation/virtual/kvm - Documentation/uml/ to Documentation/virtual/uml - Documentation/lguest/ to Documentation/virtual/lguest throughout the kernel source tree.
  Add a 00-INDEX file to Documentation/virtual Remove uml from the top level 00-INDEX file.
  Move kvm, uml, and lguest subdirectories under a common "virtual" directory, I.E:
parents e66eed65 61516587

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -328,8 +328,6 @@ sysrq.txt 
	- info on the magic SysRq key.

telephony/

	- directory with info on telephony (e.g. voice over IP) support.

uml/

	- directory with information about User Mode Linux.

unicode.txt

	- info on the Unicode character/font mapping used in Linux.

unshare.txt

Documentation/virtual/00-INDEX

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Virtualization support in the Linux kernel.



00-INDEX

	- 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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE