1. 28 5月, 2011 3 次提交
    • L
      Merge git://git.infradead.org/battery-2.6 · ea0ca3a8
      Linus Torvalds 提交于
      * git://git.infradead.org/battery-2.6:
        PXA: Use dev_pm_ops in z2_battery
        ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery
        ds2760_battery: Fix indexing of the 4 active full EEPROM registers
        power: Make test_power driver more dynamic.
        bq27x00_battery: Name of cycle count property
        max8903_charger: Add GENERIC_HARDIRQS as a dependency (fixes S390 build)
        ARM: RX-51: Enable isp1704 power on/off
        isp1704_charger: Allow board specific powering routine
        gpio-charger: Add gpio_charger_resume
        power_supply: Add driver for MAX8903 charger
      ea0ca3a8
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging · 74e6392c
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
        hwmon: (coretemp) Fix section mismatch
        hwmon: (pmbus) Initialize sysfs attributes
        hwmon: (coretemp) Update comments describing the handling of HT CPUs
        hwmon: (coretemp) Initialize sysfs attributes
      74e6392c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 09cefbb6
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits)
        ASoC: Fix power down for widgetless per-card DAPM context case
        ASoC: wm1250-ev1: Define "WM1250 Output" with SND_SOC_DAPM_OUTPUT
        ASoC: Remove duplicate linux/delay.h inclusion.
        ASoC: sam9g20_wm8731: use the proper SYSCKL value
        ASoC: wm8731: fix wm8731_check_osc() connected condition
        ALSA: hda - Reorganize controller quriks with bit flags
        ALSA: hda - Use snd_printd() in snd_hda_parse_pin_def_config()
        ALSA: core: remove unused variables.
        ALSA: HDA: Increase MAX_HDMI_PINS
        ALSA: PCM - Don't check DMA time-out too shortly
        MAINTAINERS: add FireWire audio maintainer
        ALSA: usb-audio: more control quirks for M-Audio FastTrack devices
        ALSA: usb-audio: add new quirk type QUIRK_AUDIO_STANDARD_MIXER
        ALSA: usb-audio: export snd_usb_feature_unit_ctl
        ALSA: usb-audio: rework add_control_to_empty()
        ALSA: usb-audio: move assignment of chip->ctrl_intf
        ALSA: hda - Use model=auto for Lenovo G555
        ALSA: HDA: Unify HDMI hotplug handling.
        ALSA: hda - Force AD1988_6STACK_DIG for Asus M3N-HT Deluxe
        ASoC: core - remove superfluous new line.
        ...
      09cefbb6
  2. 27 5月, 2011 37 次提交