1. 17 12月, 2009 31 次提交
  2. 16 12月, 2009 9 次提交
    • S
      mfd: compile fix for twl4030 renaming · 8bea8672
      Stephen Rothwell 提交于
      Caused by commit 0b83ddeb ("MFD:
      twl4030: add twl4030_codec MFD as a new child to the core") interacting
      with commit b07682b6 ("mfd: Rename
      twl4030* driver files to enable re-use").
      
      This file seems to have been missed in the renaming.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Acked-by: NPeter Ujfalusi <peter.ujfalusi@nokia.com>
      Acked-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Acked-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8bea8672
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · d180ec5d
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: event tracing support
        xfs: change the xfs_iext_insert / xfs_iext_remove
        xfs: cleanup bmap extent state macros
      d180ec5d
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm · 53365383
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (80 commits)
        dm snapshot: use merge origin if snapshot invalid
        dm snapshot: report merge failure in status
        dm snapshot: merge consecutive chunks together
        dm snapshot: trigger exceptions in remaining snapshots during merge
        dm snapshot: delay merging a chunk until writes to it complete
        dm snapshot: queue writes to chunks being merged
        dm snapshot: add merging
        dm snapshot: permit only one merge at once
        dm snapshot: support barriers in snapshot merge target
        dm snapshot: avoid allocating exceptions in merge
        dm snapshot: rework writing to origin
        dm snapshot: add merge target
        dm exception store: add merge specific methods
        dm snapshot: create function for chunk_is_tracked wait
        dm snapshot: make bio optional in __origin_write
        dm mpath: reject messages when device is suspended
        dm: export suspended state to targets
        dm: rename dm_suspended to dm_suspended_md
        dm: swap target postsuspend call and setting suspended flag
        dm crypt: add plain64 iv
        ...
      53365383
    • L
      Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block · 51b736b8
      Linus Torvalds 提交于
      * 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block:
        cfq: set workload as expired if it doesn't have any slice left
        Fix a CFQ crash in "for-2.6.33" branch of block tree
        cfq: Remove wait_request flag when idle time is being deleted
        cfq-iosched: commenting non-obvious initialization
        cfq-iosched: Take care of corner cases of group losing share due to deletion
        cfq-iosched: Get rid of cfqq wait_busy_done flag
        cfq: Optimization for close cooperating queue searching
        block,xd: Delay allocation of DMA buffers until device is known
        drbd: Following the hmac change to SHASH (see linux commit 8bd1209c)
        cfq-iosched: reduce write depth only if sync was delayed
      51b736b8
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · a8aa1ebd
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: ac97_codec - increase timeout for analog sections to 5 second
        ASoC: Correct code taking the size of a pointer
        ALSA: hda - Add PCI IDs for Nvidia G2xx-series
        ALSA: sound/isa/gus: Correct code taking the size of a pointer
        ALSA: hda: Fix max PCM level to 0 dB for AD1981_HP
        ALSA: hda: Use ALC260_WILL quirk for another Acer model (0x1025007f)
      a8aa1ebd
    • L
      Merge branch 'core-locking-for-linus' of... · 8f0ddf91
      Linus Torvalds 提交于
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits)
        clockevents: Convert to raw_spinlock
        clockevents: Make tick_device_lock static
        debugobjects: Convert to raw_spinlocks
        perf_event: Convert to raw_spinlock
        hrtimers: Convert to raw_spinlocks
        genirq: Convert irq_desc.lock to raw_spinlock
        smp: Convert smplocks to raw_spinlocks
        rtmutes: Convert rtmutex.lock to raw_spinlock
        sched: Convert pi_lock to raw_spinlock
        sched: Convert cpupri lock to raw_spinlock
        sched: Convert rt_runtime_lock to raw_spinlock
        sched: Convert rq->lock to raw_spinlock
        plist: Make plist debugging raw_spinlock aware
        bkl: Fixup core_lock fallout
        locking: Cleanup the name space completely
        locking: Further name space cleanups
        alpha: Fix fallout from locking changes
        locking: Implement new raw_spinlock
        locking: Convert raw_rwlock functions to arch_rwlock
        locking: Convert raw_rwlock to arch_rwlock
        ...
      8f0ddf91
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 · 050cbb09
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
        avr32: update default configurations for ATNGW100, ATSTK1002 and ATSTK1006
        avr32: add default configurations for ATNGW100 mkII and EVKLCD10X
        avr32: add support for ATNGW100 mkII board
        avr32: convert to asm-generic/hardirq.h
        avr32: add two new at91 to cpu.h definition
        avr32: clean up linker script using standard macros.
        avr32: MRMT: correct setup of SPI slaves
        avr32: function for independently setting up SPI slaves
        avr32: re-instate MCI WP/CD pin assignments for ATNGW100
      050cbb09
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 17c330f9
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc64: Fix clock event multiplier printf format.
        sparc64: Use clock{source,events}_calc_mult_shift().
        sparc64: Use free_bootmem_late() in mdesc_lmb_free().
        sparc: Add alignment and emulation fault perf events.
        sparc64: Add syscall tracepoint support.
        sparc: Stop trying to be so fancy and use __builtin_{memcpy,memset}()
        sparc: Use __builtin_object_size() to validate the buffer size for copy_from_user()
        sparc64: Add some missing __kprobes annotations to kernel fault paths.
        sparc64: Use kprobes_built_in() to avoid ifdefs in fault_64.c
        sparc: Validate that kprobe address is 4-byte aligned.
        sparc64: Don't specify IRQF_SHARED for LDC interrupts.
        sparc64: Fix stack debugging IRQ stack regression.
        sparc64: Fix overly strict range type matching for PCI devices.
      17c330f9
    • L
      Merge git://git.infradead.org/battery-2.6 · 48e902f0
      Linus Torvalds 提交于
      * git://git.infradead.org/battery-2.6:
        power_supply_sysfs: Handle -ENODATA in a special way
        wm831x_backup: Remove unused variables
        gta02: Set pcf50633 charger_reference_current_ma
        pcf50633: Query charger status directly
        pcf50633: Properly reenable charging when the supply conditions change
        pcf50633: Get rid of charging restart software auto-triggering
        pcf50633: introduces battery charging current control
        pcf50633: Add ac power supply class to the charger
        wm831x: Factor out WM831x backup battery charger
      48e902f0