Pull trivial into release branch

diff --combined Documentation/kernel-parameters.txt
index b3a6187,78eb66b..a853e86
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -1,4 -1,4 +1,4 @@@
 -February 2003             Kernel Parameters                     v2.5.59
 +                          Kernel Parameters
                            ~~~~~~~~~~~~~~~~~
  
  The following is a consolidated list of the kernel parameters as implemented
@@@ -17,17 -17,9 +17,17 @@@ are specified on the kernel command lin
  
        usbcore.blinkenlights=1
  
 -The text in square brackets at the beginning of the description states the
 -restrictions on the kernel for the said kernel parameter to be valid. The
 -restrictions referred to are that the relevant option is valid if:
 +This document may not be entirely up to date and comprehensive. The command
 +"modinfo -p ${modulename}" shows a current list of all parameters of a loadable
 +module. Loadable modules, after being loaded into the running kernel, also
 +reveal their parameters in /sys/module/${modulename}/parameters/. Some of these
 +parameters may be changed at runtime by the command
 +"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}".
 +
 +The parameters listed below are only valid if certain kernel build options were
 +enabled and if respective hardware is present. The text in square brackets at
 +the beginning of each description states the restrictions within which a
 +parameter is applicable:
  
        ACPI    ACPI support is enabled.
        ALSA    ALSA sound support is enabled.
@@@ -147,6 -139,9 +147,9 @@@ running once the system is up
        acpi_irq_isa=   [HW,ACPI] If irq_balance, mark listed IRQs used by ISA
                        Format: <irq>,<irq>...
  
+       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_serialize  [HW,ACPI] force serialization of AML methods
@@@ -1054,10 -1049,10 +1057,10 @@@
        noltlbs         [PPC] Do not use large page/tlb entries for kernel
                        lowmem mapping on PPC40x.
  
 -      nomce           [IA-32] Machine Check Exception
 -
        nomca           [IA-64] Disable machine check abort handling
  
 +      nomce           [IA-32] Machine Check Exception
 +
        noresidual      [PPC] Don't use residual data on PReP machines.
  
        noresume        [SWSUSP] Disables resume and restores original swap
@@@ -1690,6 -1685,20 +1693,6 @@@
  
  
  ______________________________________________________________________
 -Changelog:
 -
 -2000-06-??    Mr. Unknown
 -      The last known update (for 2.4.0) - the changelog was not kept before.
 -
 -2002-11-24    Petr Baudis <pasky@ucw.cz>
 -              Randy Dunlap <randy.dunlap@verizon.net>
 -      Update for 2.5.49, description for most of the options introduced,
 -      references to other documentation (C files, READMEs, ..), added S390,
 -      PPC, SPARC, MTD, ALSA and OSS category. Minor corrections and
 -      reformatting.
 -
 -2005-10-19    Randy Dunlap <rdunlap@xenotime.net>
 -      Lots of typos, whitespace, some reformatting.
  
  TODO:
  

diff --combined drivers/acpi/thermal.c
index fba9c23,d0b44ce..a29af58
--- 1/drivers/acpi/thermal.c
--- 2/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@@ -684,7 -684,8 +684,7 @@@ static void acpi_thermal_run(unsigned l
  {
        struct acpi_thermal *tz = (struct acpi_thermal *)data;
        if (!tz->zombie)
 -              acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
 -                                          acpi_thermal_check, (void *)data);
 +              acpi_os_execute(OSL_GPE_HANDLER, acpi_thermal_check, (void *)data);
  }
  
  static void acpi_thermal_check(void *data)
@@@ -941,8 -942,10 +941,10 @@@ acpi_thermal_write_trip_points(struct f
        memset(limit_string, 0, ACPI_THERMAL_MAX_LIMIT_STR_LEN);
  
        active = kmalloc(ACPI_THERMAL_MAX_ACTIVE * sizeof(int), GFP_KERNEL);
-       if (!active)
+       if (!active) {
+               kfree(limit_string);
                return_VALUE(-ENOMEM);
+       }
  
        if (!tz || (count > ACPI_THERMAL_MAX_LIMIT_STR_LEN - 1)) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid argument\n"));