1. 16 Jun, 2009 8 commits
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 4858704d
      Linus Torvalds authored
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        therm_windtunnel: Convert to a new-style i2c driver
        therm_adt746x: Convert to a new-style i2c driver
        windfarm: Convert to new-style i2c drivers
        therm_pm72: Convert to a new-style i2c driver
        i2c-viapro: Add new PCI device ID for VX855
        i2c/chips: Move max6875 to drivers/misc/eeprom
        i2c: Do not give adapters a default parent
        i2c: Do not probe for TV chips on Voodoo3 adapters
        i2c: Retry automatically on arbitration loss
        i2c: Remove void casts
      4858704d
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 86ade88e
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (max6650) Add support for alarms
        hwmon: (f71882fg) Add support for the F71858F
        hwmon: (f71882fg) Add temp#_fault sysfs attr for f8000
        hwmon: (f71882fg) Sanity check f8000 pwm settings
        hwmon: (f71882fg) Cleanup f8000 pwm handling
        hwmon: PCI quirk for hwmon access on MSI MS-7031 board
        hwmon: (w83627ehf) Add W83627DHG-P support
        hwmon: (tmp401) Add documentation
        hwmon: (tmp401) Add support for TI's TMP411 sensors chip
        hwmon: (tmp401) Add support for TI's TMP401 sensor chip
        hwmon: (ibmaem) Automatically load on HC10 blade
        hwmon: Fix more __devexit_p glitches
      86ade88e
    • Linus Torvalds's avatar
      Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 9bd47bf9
      Linus Torvalds authored
      * 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (27 commits)
        ACPICA: Update version to 20090521.
        ACPICA: Disable preservation of SCI enable bit (SCI_EN)
        ACPICA: Region deletion: Ensure region object is removed from handler list
        ACPICA: Eliminate extra call to NsGetParentNode
        ACPICA: Simplify internal operation region interface
        ACPICA: Update Load() to use operation region interfaces
        ACPICA: New: AcpiInstallMethod - install a single control method
        ACPICA: Invalidate DdbHandle after table unload
        ACPICA: Fix reference count issues for DdbHandle object
        ACPICA: Simplify and optimize NsGetNextNode function
        ACPICA: Additional validation of _PRT packages (resource mgr)
        ACPICA: Fix DebugObject output for DdbHandle objects
        ACPICA: Fix allowable release order for ASL mutex objects
        ACPICA: Mutex support: Fix release ordering issue and current sync level
        ACPICA: Update version to 20090422.
        ACPICA: Linux OSL: cleanup/update/merge
        ACPICA: Fix implementation of AML BreakPoint operator (break to debugger)
        ACPICA: Fix miscellaneous warnings under gcc 4+
        ACPICA: Miscellaneous lint changes
        ACPICA: Fix possible dereference of null pointer
        ...
      9bd47bf9
    • Alan Cox's avatar
      tty: Fix leaks introduced by the shift to separate ldisc objects · 46a50661
      Alan Cox authored
      Gold star for the kmemleak detector.
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      46a50661
    • Alan Cox's avatar
      pty: Narrow the race on ldisc locking · cbcb6d66
      Alan Cox authored
      The pty code has always been buggy on its ldisc handling. The recent
      changes made the window for the race much bigger. Pending fixing it
      properly which is not at all trivial, at least make the race small again so
      we don't disrupt other dev work.
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cbcb6d66
    • Linus Torvalds's avatar
      printk: add KERN_DEFAULT loglevel to print_modules() · b231125a
      Linus Torvalds authored
      Several WARN_ON() messages omit the '\n' at the end of the string, which
      is a simple (and understandable) error.  The next line printed after
      that warning line is usually the current module list, and that printk
      does not have a log-level marker - resulting in one long mixed-up line.
      
      Adding this loglevel marker will now avoid this unreadable mess.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b231125a
    • Linus Torvalds's avatar
      printk: Add KERN_DEFAULT printk log-level · e28d7137
      Linus Torvalds authored
      This adds a KERN_DEFAULT loglevel marker, for when you cannot decide
      which loglevel you want, and just want to keep an existing printk
      with the default loglevel.
      
      The difference between having KERN_DEFAULT and having no log-level
      marker at all is two-fold:
      
       - having the log-level marker will now force a new-line if the
         previous printout had not added one (perhaps because it forgot,
         but perhaps because it expected a continuation)
      
       - having a log-level marker is required if you are printing out a
         message that otherwise itself could perhaps otherwise be mistaken
         for a log-level.
      Signed-of-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e28d7137
    • Linus Torvalds's avatar
      printk: clean up handling of log-levels and newlines · 5fd29d6c
      Linus Torvalds authored
      It used to be that we would only look at the log-level in a printk()
      after explicit newlines, which can cause annoying problems when the
      previous printk() did not end with a '\n'. In that case, the log-level
      marker would be just printed out in the middle of the line, and be
      seen as just noise rather than change the logging level.
      
      This changes things to always look at the log-level in the first
      bytes of the printout. If a log level marker is found, it is always
      used as the log-level. Additionally, if no newline existed, one is
      added (unless the log-level is the explicit KERN_CONT marker, to
      explicitly show that it's a continuation of a previous line).
      Acked-by: default avatarArjan van de Ven <arjan@infradead.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5fd29d6c
  2. 15 Jun, 2009 32 commits