diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 17:55:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 17:55:34 -0400 |
commit | 7663164f2619e37a1dcad59383e2fcf8c5194107 (patch) | |
tree | 69d030b8997570715af3b772ea027ffe957c4f5c /MAINTAINERS | |
parent | e66eed651fd18a961f11cda62f3b5286c8cc4f9f (diff) | |
parent | 61516587513c84ac26e68e3ab008dc6e965d0378 (diff) |
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-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 69f19f10314a..eeecb504494c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3814,7 +3814,7 @@ M: Rusty Russell <rusty@rustcorp.com.au> | |||
3814 | L: lguest@lists.ozlabs.org | 3814 | L: lguest@lists.ozlabs.org |
3815 | W: http://lguest.ozlabs.org/ | 3815 | W: http://lguest.ozlabs.org/ |
3816 | S: Odd Fixes | 3816 | S: Odd Fixes |
3817 | F: Documentation/lguest/ | 3817 | F: Documentation/virtual/lguest/ |
3818 | F: arch/x86/lguest/ | 3818 | F: arch/x86/lguest/ |
3819 | F: drivers/lguest/ | 3819 | F: drivers/lguest/ |
3820 | F: include/linux/lguest*.h | 3820 | F: include/linux/lguest*.h |
@@ -6632,7 +6632,7 @@ L: user-mode-linux-devel@lists.sourceforge.net | |||
6632 | L: user-mode-linux-user@lists.sourceforge.net | 6632 | L: user-mode-linux-user@lists.sourceforge.net |
6633 | W: http://user-mode-linux.sourceforge.net | 6633 | W: http://user-mode-linux.sourceforge.net |
6634 | S: Maintained | 6634 | S: Maintained |
6635 | F: Documentation/uml/ | 6635 | F: Documentation/virtual/uml/ |
6636 | F: arch/um/ | 6636 | F: arch/um/ |
6637 | F: fs/hostfs/ | 6637 | F: fs/hostfs/ |
6638 | F: fs/hppfs/ | 6638 | F: fs/hppfs/ |