From 12dd13f1d246137d6b02b4ae28a81dc9ab533773 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 15 Feb 2012 00:26:42 +0900 Subject: [PATCH] --- yaml --- r: 291755 b: refs/heads/master c: 24775d652b4dc52cc8dbcbdd20a732e5bdcc416a h: refs/heads/master i: 291753: b360fe63816bb91150212dfc2eb874dd83921336 291751: 5ba807051ba17bae59d8ee60a2b4ad5e93b76a61 v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b5d632a439c6..a39aa3df7b0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15b9cf6d3217452b23cc880cd02684af9a5625d9 +refs/heads/master: 24775d652b4dc52cc8dbcbdd20a732e5bdcc416a diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 033d4e69b43b..cfcc73f2b822 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -950,7 +950,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. controller i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX controllers - i8042.notimeout [HW] Ignore timeout condition signalled by conroller + i8042.notimeout [HW] Ignore timeout condition signalled by controller i8042.reset [HW] Reset the controller during init and cleanup i8042.unlock [HW] Unlock (ignore) the keylock @@ -2434,7 +2434,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. For more information see Documentation/vm/slub.txt. slub_min_order= [MM, SLUB] - Determines the mininum page order for slabs. Must be + Determines the minimum page order for slabs. Must be lower than slub_max_order. For more information see Documentation/vm/slub.txt. @@ -2600,7 +2600,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. threadirqs [KNL] Force threading of all interrupt handlers except those - marked explicitely IRQF_NO_THREAD. + marked explicitly IRQF_NO_THREAD. topology= [S390] Format: {off | on}