1. 26 5月, 2010 2 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 · 99765cc7
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
        regulator: return set_mode is same mode is requested
        Regulators: ab3100/bq24022: add a missing .owner field in regulator_desc
        twl6030: regulator: Remove vsel tables and use formula for calculation
        mc13783-regulator: fix vaild voltage range checking for mc13783_fixed_regulator_set_voltage
        regulator: use voltage number array in 88pm860x
        regulator: make 88pm860x sharing one driver structure
        regulator: simplify regulator_register() error handling
        regulator: fix unset_regulator_supplies() to remove all matches
        regulator: prevent registration of matching regulator consumer supplies
        regulator: Allow regulator-regulator supplies to be specified by name
      99765cc7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 51e618c3
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        watchdog: Driver for the watchdog timer on Freescale IMX2 (and later) processors.
        watchdog: s3c2410_wdt - Fix on handling of the request_mem_region fail
        watchdog: s3c2410_wdt - Add extra option to include watchdog for Samsung SoCs
        iTCO_wdt: fix TCO V1 timeout values and limits
        watchdog: twl4030_wdt: Disable watchdog during probing
        watchdog: update/improve/consolidate watchdog driver
        watchdog: booke_wdt: fix ioctl status flags
        watchdog: fix several MODULE_PARM_DESC strings
        watchdog: bfin: use new common Blackfin watchdog header
      51e618c3
  2. 25 5月, 2010 38 次提交