Merge branch 'master' into for-next

[~andy/linux] / drivers / xen / Kconfig

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index c794ea1821402dc21e47af3d8b398c9d4f3209e6..12ba6db651427aa6bf11c9cc4e2d219157c03828 100644 (file)
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -222,7 +222,7 @@ config XEN_ACPI_PROCESSOR
 
          To do that the driver parses the Power Management data and uploads
          said information to the Xen hypervisor. Then the Xen hypervisor can
 
          To do that the driver parses the Power Management data and uploads
          said information to the Xen hypervisor. Then the Xen hypervisor can

-         select the proper Cx and Pxx states. It also registers itslef as the
+         select the proper Cx and Pxx states. It also registers itself as the

          SMM so that other drivers (such as ACPI cpufreq scaling driver) will
          not load.
 
          SMM so that other drivers (such as ACPI cpufreq scaling driver) will
          not load.