diff --git a/[refs] b/[refs]
index c2bcf60e261a..abfbc3a0eaea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1c81401de30448baf35ec2f689ad21faffb0536
+refs/heads/master: b09b296dddde0998e2019d2f355212642056253f
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
index 0b815de9254e..fb7e436b40c7 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -508,6 +508,11 @@ static int iwl_pci_suspend(struct device *device)
 	struct pci_dev *pdev = to_pci_dev(device);
 	struct iwl_bus *bus = pci_get_drvdata(pdev);
 
+	/* Before you put code here, think about WoWLAN. You cannot check here
+	 * whether WoWLAN is enabled or not, and your code will run even if
+	 * WoWLAN is enabled - don't kill the NIC, someone may need it in Sx.
+	 */
+
 	return iwl_suspend(bus->drv_data);
 }
 
@@ -516,6 +521,11 @@ static int iwl_pci_resume(struct device *device)
 	struct pci_dev *pdev = to_pci_dev(device);
 	struct iwl_bus *bus = pci_get_drvdata(pdev);
 
+	/* Before you put code here, think about WoWLAN. You cannot check here
+	 * whether WoWLAN is enabled or not, and your code will run even if
+	 * WoWLAN is enabled - the NIC may be alive.
+	 */
+
 	/*
 	 * We disable the RETRY_TIMEOUT register (0x41) to keep
 	 * PCI Tx retries from interfering with C3 CPU state.