1. 19 9月, 2009 4 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · 5ce00289
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: use kernel_sendpage
        dlm: fix connection close handling
        dlm: fix double-release of socket in error exit path
      5ce00289
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 2511817c
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
        ext3: Flush disk caches on fsync when needed
        ext3: Add locking to ext3_do_update_inode
        ext3: Fix possible deadlock between ext3_truncate() and ext3_get_blocks()
        jbd: Annotate transaction start also for journal_restart()
        jbd: Journal block numbers can ever be only 32-bit use unsigned int for them
        ext3: Update MAINTAINERS for ext3 and JBD
        JBD: round commit timer up to avoid uncommitted transaction
      2511817c
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · 714af069
      Linus Torvalds 提交于
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
        [CPUFREQ] Fix NULL ptr regression in powernow-k8
        [CPUFREQ] Create a blacklist for processors that should not load the acpi-cpufreq module.
        [CPUFREQ] Powernow-k8: Enable more than 2 low P-states
        [CPUFREQ] remove rwsem lock from CPUFREQ_GOV_STOP call (second call site)
        [CPUFREQ] ondemand - Use global sysfs dir for tuning settings
        [CPUFREQ] Introduce global, not per core: /sys/devices/system/cpu/cpufreq
        [CPUFREQ] Bail out of cpufreq_add_dev if the link for a managed CPU got created
        [CPUFREQ] Factor out policy setting from cpufreq_add_dev
        [CPUFREQ] Factor out interface creation from cpufreq_add_dev
        [CPUFREQ] Factor out symlink creation from cpufreq_add_dev
        [CPUFREQ] cleanup up -ENOMEM handling in cpufreq_add_dev
        [CPUFREQ] Reduce scope of cpu_sys_dev in cpufreq_add_dev
        [CPUFREQ] update Doc for cpuinfo_cur_freq and scaling_cur_freq
      714af069
    • L
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · a03fdb76
      Linus Torvalds 提交于
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (34 commits)
        time: Prevent 32 bit overflow with set_normalized_timespec()
        clocksource: Delay clocksource down rating to late boot
        clocksource: clocksource_select must be called with mutex locked
        clocksource: Resolve cpu hotplug dead lock with TSC unstable, fix crash
        timers: Drop a function prototype
        clocksource: Resolve cpu hotplug dead lock with TSC unstable
        timer.c: Fix S/390 comments
        timekeeping: Fix invalid getboottime() value
        timekeeping: Fix up read_persistent_clock() breakage on sh
        timekeeping: Increase granularity of read_persistent_clock(), build fix
        time: Introduce CLOCK_REALTIME_COARSE
        x86: Do not unregister PIT clocksource on PIT oneshot setup/shutdown
        clocksource: Avoid clocksource watchdog circular locking dependency
        clocksource: Protect the watchdog rating changes with clocksource_mutex
        clocksource: Call clocksource_change_rating() outside of watchdog_lock
        timekeeping: Introduce read_boot_clock
        timekeeping: Increase granularity of read_persistent_clock()
        timekeeping: Update clocksource with stop_machine
        timekeeping: Add timekeeper read_clock helper functions
        timekeeping: Move NTP adjusted clock multiplier to struct timekeeper
        ...
      
      Fix trivial conflict due to MIPS lemote -> loongson renaming.
      a03fdb76
  2. 18 9月, 2009 36 次提交