Merge tag 'remoteproc-3.15-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index c205653e96447b12ab9ed163715bf9d64c0cd230..ab686b31010034083ba3b4784ba288fb93b3f554 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -31,10 +31,14 @@ menuconfig ACPI
          ACPI CA, see:
          <http://acpica.org/>
 
-         ACPI is an open industry specification co-developed by
-         Hewlett-Packard, Intel, Microsoft, Phoenix, and Toshiba.
+         ACPI is an open industry specification originally co-developed by
+         Hewlett-Packard, Intel, Microsoft, Phoenix, and Toshiba. Currently,
+         it is developed by the ACPI Specification Working Group (ASWG) under
+         the UEFI Forum and any UEFI member can join the ASWG and contribute
+         to the ACPI specification.
          The specification is available at:
          <http://www.acpi.info>
+         <http://www.uefi.org/acpi/specs>
 
 if ACPI