Merge branch 'master' of /home/cbou/linux-2.6

Conflicts:

	drivers/power/Kconfig
	drivers/power/Makefile

1 files changed, 15 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-hugepages b/Documentation/ABI/testing/sysfs-kernel-mm-hugepages
new file mode 100644
index 000000000000..e21c00571cf4
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-kernel-mm-hugepages
@@ -0,0 +1,15 @@
+What:           /sys/kernel/mm/hugepages/
+Date:           June 2008
+Contact:        Nishanth Aravamudan <nacc@us.ibm.com>, hugetlb maintainers
+Description:
+                /sys/kernel/mm/hugepages/ contains a number of subdirectories
+                of the form hugepages-<size>kB, where <size> is the page size
+                of the hugepages supported by the kernel/CPU combination.
+
+                Under these directories are a number of files:
+                        nr_hugepages
+                        nr_overcommit_hugepages
+                        free_hugepages
+                        surplus_hugepages
+                        resv_hugepages
+                See Documentation/vm/hugetlbpage.txt for details.