rebase patches

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2018-04-20 11:35:55 +02:00
committed by Thomas Lamprecht
parent eb19cd991b
commit 927081a949
2 changed files with 3 additions and 3 deletions
@@ -54,7 +54,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2 files changed, 110 insertions(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 2db36b52a4ff..9b7f4e3e6e30 100644
index f49ba96f8881..133fcf975b80 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2968,6 +2968,15 @@