Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 May 2011 21:55:34 +0000 (14:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 May 2011 21:55:34 +0000 (14:55 -0700)
* '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:

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge