Merge branch 'origin' into misc

3 files changed, 10 insertions, 2 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 1808f1157f30..4ddb58df081e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1265,7 +1265,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         If there are multiple matching configurations changing
                         the same attribute, the last one is used.
 
-        lmb=debug       [KNL] Enable lmb debug messages.
+        memblock=debug  [KNL] Enable memblock debug messages.
 
         load_ramdisk=   [RAM] List of ramdisks to load from floppy
                         See Documentation/blockdev/ramdisk.txt.
@@ -2048,7 +2048,9 @@ and is between 256 and 4096 characters. It is defined in the file
                         WARNING: Forcing ASPM on may cause system lockups.
 
         pcie_pme=       [PCIE,PM] Native PCIe PME signaling options:
-                off     Do not use native PCIe PME signaling.
+                        Format: {auto|force}[,nomsi]
+                auto    Use native PCIe PME signaling if the BIOS allows the
+                        kernel to control PCIe config registers of root ports.
                 force   Use native PCIe PME signaling even if the BIOS refuses
                         to allow the kernel to control the relevant PCIe config
                         registers.
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
index 9b2e0dd6017e..e67c1db96854 100644
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
@@ -82,3 +82,4 @@ tuner=81 - Partsnic (Daewoo) PTI-5NF05
 tuner=82 - Philips CU1216L
 tuner=83 - NXP TDA18271
 tuner=84 - Sony BTF-Pxn01Z
+tuner=85 - Philips FQ1236 MK5
diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt
index 41c95cc1dc1f..17ddd822b456 100644
--- a/Documentation/watchdog/watchdog-parameters.txt
+++ b/Documentation/watchdog/watchdog-parameters.txt
@@ -125,6 +125,11 @@ ibmasr:
 nowayout: Watchdog cannot be stopped once started
         (default=kernel config parameter)
 -------------------------------------------------
+imx2_wdt:
+timeout: Watchdog timeout in seconds (default 60 s)
+nowayout: Watchdog cannot be stopped once started
+        (default=kernel config parameter)
+-------------------------------------------------
 indydog:
 nowayout: Watchdog cannot be stopped once started
         (default=kernel config parameter)