1. 18 9月, 2009 3 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 66bc4a6f
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (53 commits)
        m68knommu: Make PAGE_SIZE available to assembly files.
        m68knommu: fix ColdFire definition of CLOCK_TICK_RATE
        m68knommu: set multi-function pins for ethernet when enabled
        m68knommu: remove special interrupt handling code for ne2k support
        m68knommu: relax IO_SPACE_LIMIT setting
        m68knommu: remove ColdFire direct interrupt register access
        m68knommu: create a speciailized ColdFire 5272 interrupt controller
        m68knommu: add support for second interrupt controller of ColdFire 5249
        m68knommu: clean up old ColdFire timer irq setup
        m68knommu: map ColdFire interrupts to correct masking bits
        m68knommu: clean up ColdFire 532x CPU timer setup
        m68knommu: simplify ColdFire "timers" clock initialization
        m68knommu: support code to mask external interrupts on old ColdFire CPU's
        m68knommu: merge old ColdFire interrupt controller masking macros
        m68knommu: remove duplicate ColdFire mcf_autovector() code
        m68knommu: move ColdFire INTC definitions to new include file
        m68knommu: mask off all interrupts in ColdFire intc-simr controller
        m68knommu: remove timer device interrupt setup for ColdFire 532x
        m68knommu: remove interrupt masking from ColdFire pit timer
        m68knommu: remove unecessary interrupt level setting in ColdFire 520x setup
        ...
      66bc4a6f
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 96c015b7
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (lm85) Don't bind to Winbond/Nuvoton WPCD377I
        hwmon: (pcf8591) Documentation clean-ups
        hwmon: Clearly mark ACPI drivers as such
        hwmon: Use resource_size
        hwmon: Include <linux/io.h> instead of <asm/io.h>
        hwmon: (tmp421) Add documentation
        hwmon: Add driver for Texas Instruments TMP421/422/423 sensor chips
        hwmon-vid: Ignore 6th VID pin of AMD family 0Fh processors
        hwmon: (asus_atk0110) Add maintainer information
        hwmon: (abituguru3) Support multiple DMI strings per chip ID
      96c015b7
    • L
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb · 3aee0605
      Linus Torvalds 提交于
      * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
        uwb: avoid radio controller reset loops
        uwb: stop uwbd thread if rc->start() fails
        uwb: handle radio controller events with out-of-range IDs correctly
      3aee0605
  2. 17 9月, 2009 1 次提交
  3. 16 9月, 2009 36 次提交