1. 28 5月, 2011 8 次提交
    • L
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · 81faae7f
      Linus Torvalds 提交于
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
        Ocfs2/move_extents: Validate moving goal after the adjustment.
        Ocfs2/move_extents: Avoid doing division in extent moving.
      81faae7f
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 95948c31
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
        [S390] mm: add ZONE_DMA to 31-bit config again
        [S390] mm: add page fault retry handling
        [S390] mm: handle kernel caused page fault oom situations
        [S390] delay: implement ndelay
        [S390] topology,sched: fix cpu_coregroup_mask/cpu_book_mask definitions
        [S390] hwsampler: allow cpu hotplug
        [S390] uaccess: turn __access_ok() into a define
        [S390] irq: merge irq.c and s390_ext.c
        [S390] irq: fix service signal external interrupt handling
        [S390] pfault: always enable service signal interrupt
      95948c31
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 45acab01
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/fsl_rio: Error interrupt handler for sRIO on MPC85xx
        powerpc/fsl_rio: move machine_check handler
        powerpc/fsl_lbc: Add workaround for ELBC-A001 erratum
      45acab01
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · c0880dcd
      Linus Torvalds 提交于
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
        [media] v1.88 DM04/QQBOX Move remote to use rc_core dvb-usb-remote
        [media] Add missing include guard to header file
        [media] Inlined functions should be static
        [media] Remove invalid parameter description
        [media] cpia2: fix warning about invalid trigraph sequence
        [media] s5p-csis: Add missing dependency on PLAT_S5P
        [media] gspca/kinect: wrap gspca_debug with GSPCA_DEBUG
        [media] fintek-cir: new driver for Fintek LPC SuperIO CIR function
        [media] uvcvideo: Connect video devices to media entities
        [media] uvcvideo: Register subdevices for each entity
        [media] uvcvideo: Register a v4l2_device
        [media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook
        [media] Documentation/DocBook: Rename media fops xml files
        [media] Media DocBook: fix validation errors
        [media] wl12xx: g_volatile_ctrl fix: wrong field set
        [media] fix kconfig dependency warning for VIDEO_TIMBERDALE
        [media] dm1105: GPIO handling added, I2C on GPIO added, LNB control through GPIO reworked
        [media] Add support for M-5MOLS 8 Mega Pixel camera ISP
      c0880dcd
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 · f7fc06e3
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (42 commits)
        regulator: Fix _regulator_get_voltage if get_voltage callback is NULL
        USB: TWL6025 allow different regulator name
        REGULATOR: TWL6025: add support to twl-regulator
        regulator: twl6030: do not write to _GRP for regulator disable
        regulator: twl6030: do not write to _GRP for regulator enable
        TPS65911: Comparator: Add comparator driver
        TPS65911: Add support for added GPIO lines
        GPIO: TPS65910: Move driver to drivers/gpio/
        TPS65911: Add new irq definitions
        regulator: tps65911: Add new chip version
        MFD: TPS65910: Add support for TPS65911 device
        regulator: Fix off-by-one value range checking for mc13xxx_regulator_get_voltage
        regulator: mc13892: Fix voltage unit in test case.
        regulator: Remove MAX8997_REG_BUCK1DVS/MAX8997_REG_BUCK2DVS/MAX8997_REG_BUCK5DVS macros
        mfd: Fix off-by-one value range checking for tps65910_i2c_write
        regulator: Only apply voltage constraints from consumers that set them
        regulator: If we can't configure optimum mode we're always in the best one
        regulator: max8997: remove useless code
        regulator: Fix memory leak in max8998_pmic_probe failure path
        regulator: Fix desc_id for tps65023/6507x/65910
        ...
      f7fc06e3
    • 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 32 次提交