Pull osi-now into release branch

diff --combined Documentation/kernel-parameters.txt
index ce91560229f5356e4c83c87fe98a1d94d827da94,79150144dca90e8a901dcff1d596c56050281197..5d0283cd3a81997fde0eaf901417ac0de33bf16b
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -170,7 -170,10 +170,10 @@@ and is between 256 and 4096 characters
        acpi_os_name=   [HW,ACPI] Tell ACPI BIOS the name of the OS
                        Format: To spoof as Windows 98: ="Microsoft Windows"
  
-       acpi_osi=       [HW,ACPI] empty param disables _OSI
+       acpi_osi=       [HW,ACPI] Modify list of supported OS interface strings
+                       acpi_osi="string1"      # add string1 -- only one string
+                       acpi_osi="!string2"     # remove built-in string2
+                       acpi_osi=               # disable all strings
  
        acpi_serialize  [HW,ACPI] force serialization of AML methods
  
@@@ -1132,9 -1135,9 +1135,9 @@@
                        when set.
                        Format: <int>
  
 -      noaliencache    [MM, NUMA] Disables the allcoation of alien caches in
 -                      the slab allocator.  Saves per-node memory, but will
 -                      impact performance on real NUMA hardware.
 +      noaliencache    [MM, NUMA, SLAB] Disables the allocation of alien
 +                      caches in the slab allocator.  Saves per-node memory,
 +                      but will impact performance.
  
        noalign         [KNL,ARM]
  
@@@ -1613,37 -1616,6 +1616,37 @@@
  
        slram=          [HW,MTD]
  
 +      slub_debug      [MM, SLUB]
 +                      Enabling slub_debug allows one to determine the culprit
 +                      if slab objects become corrupted. Enabling slub_debug
 +                      creates guard zones around objects and poisons objects
 +                      when not in use. Also tracks the last alloc / free.
 +                      For more information see Documentation/vm/slub.txt.
 +
 +      slub_max_order= [MM, SLUB]
 +                      Determines the maximum allowed order for slabs. Setting
 +                      this too high may cause fragmentation.
 +                      For more information see Documentation/vm/slub.txt.
 +
 +      slub_min_objects=       [MM, SLUB]
 +                      The minimum objects per slab. SLUB will increase the
 +                      slab order up to slub_max_order to generate a
 +                      sufficiently big slab to satisfy the number of objects.
 +                      The higher the number of objects the smaller the overhead
 +                      of tracking slabs.
 +                      For more information see Documentation/vm/slub.txt.
 +
 +      slub_min_order= [MM, SLUB]
 +                      Determines the mininum page order for slabs. Must be
 +                      lower than slub_max_order
 +                      For more information see Documentation/vm/slub.txt.
 +
 +      slub_nomerge    [MM, SLUB]
 +                      Disable merging of slabs of similar size. May be
 +                      necessary if there is some reason to distinguish
 +                      allocs to different slabs.
 +                      For more information see Documentation/vm/slub.txt.
 +
        smart2=         [HW]
                        Format: <io1>[,<io2>[,...,<io8>]]