diff --git a/[refs] b/[refs]
index c122a086ed47..6c2a736b73bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85b8582d7ca516030efb84d94fa29a73c1d9a125
+refs/heads/master: d56641c7723c92487fb4bbcd995ad74169e2329b
diff --git a/trunk/drivers/pci/pcie/Kconfig b/trunk/drivers/pci/pcie/Kconfig
index dc29348264c6..72962cc92e0a 100644
--- a/trunk/drivers/pci/pcie/Kconfig
+++ b/trunk/drivers/pci/pcie/Kconfig
@@ -39,7 +39,7 @@ config PCIEASPM
 	  Power Management) and Clock Power Management. ASPM supports
 	  state L0/L0s/L1.
 
-	  ASPM is initially set up the the firmware. With this option enabled,
+	  ASPM is initially set up by the firmware. With this option enabled,
 	  Linux can modify this state in order to disable ASPM on known-bad
 	  hardware or configurations and enable it when known-safe.