Merge branch 'x86/setup' into x86/devel

[linux-2.6-omap-h63xx.git] / Documentation / x86 / x86_64 / mm.txt

diff --git a/Documentation/x86_64/mm.txt b/Documentation/x86/x86_64/mm.txt
similarity index 100%
rename from Documentation/x86_64/mm.txt
rename to Documentation/x86/x86_64/mm.txt