summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 14:55:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 14:55:34 -0700
commit7663164f2619e37a1dcad59383e2fcf8c5194107 (patch)
tree69d030b8997570715af3b772ea027ffe957c4f5c /MAINTAINERS
parente66eed651fd18a961f11cda62f3b5286c8cc4f9f (diff)
parent61516587513c84ac26e68e3ab008dc6e965d0378 (diff)
downloadlinux-3.10-7663164f2619e37a1dcad59383e2fcf8c5194107.tar.gz
linux-3.10-7663164f2619e37a1dcad59383e2fcf8c5194107.tar.bz2
linux-3.10-7663164f2619e37a1dcad59383e2fcf8c5194107.zip
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:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 69f19f10314..eeecb504494 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3814,7 +3814,7 @@ M: Rusty Russell <rusty@rustcorp.com.au>
L: lguest@lists.ozlabs.org
W: http://lguest.ozlabs.org/
S: Odd Fixes
-F: Documentation/lguest/
+F: Documentation/virtual/lguest/
F: arch/x86/lguest/
F: drivers/lguest/
F: include/linux/lguest*.h
@@ -6632,7 +6632,7 @@ L: user-mode-linux-devel@lists.sourceforge.net
L: user-mode-linux-user@lists.sourceforge.net
W: http://user-mode-linux.sourceforge.net
S: Maintained
-F: Documentation/uml/
+F: Documentation/virtual/uml/
F: arch/um/
F: fs/hostfs/
F: fs/hppfs/