Merge branch 'master' into upstream
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / Documentation / x86_64 / 
treeaa34ff8388c572fe2eb052a3f3f84664da31ef0c
drwxr-xr-x   ..
-rw-r--r-- 7646 boot-options.txt
-rw-r--r-- 1152 cpu-hotplug-spec
-rw-r--r-- 1112 mm.txt