Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 4dc76bc45c9d..00ff53348491 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -330,6 +330,20 @@ config SENSORS_CORETEMP
           sensor inside your CPU. Supported all are all known variants
           of Intel Core family.
 
+config SENSORS_IBMAEM
+        tristate "IBM Active Energy Manager temperature/power sensors and control"
+        select IPMI_SI
+        depends on IPMI_HANDLER
+        help
+          If you say yes here you get support for the temperature and
+          power sensors and capping hardware in various IBM System X
+          servers that support Active Energy Manager.  This includes
+          the x3350, x3550, x3650, x3655, x3755, x3850 M2, x3950 M2,
+          and certain HS2x/LS2x/QS2x blades.
+
+          This driver can also be built as a module.  If so, the module
+          will be called ibmaem.
+
 config SENSORS_IBMPEX
         tristate "IBM PowerExecutive temperature/power sensors"
         select IPMI_SI