1. 12 Dec, 2009 2 commits
    • Linus Torvalds's avatar
      Merge branch 'perf-fixes-for-linus' of... · 6f696eb1
      Linus Torvalds authored
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (57 commits)
        x86, perf events: Check if we have APIC enabled
        perf_event: Fix variable initialization in other codepaths
        perf kmem: Fix unused argument build warning
        perf symbols: perf_header__read_build_ids() offset'n'size should be u64
        perf symbols: dsos__read_build_ids() should read both user and kernel buildids
        perf tools: Align long options which have no short forms
        perf kmem: Show usage if no option is specified
        sched: Mark sched_clock() as notrace
        perf sched: Add max delay time snapshot
        perf tools: Correct size given to memset
        perf_event: Fix perf_swevent_hrtimer() variable initialization
        perf sched: Fix for getting task's execution time
        tracing/kprobes: Fix field creation's bad error handling
        perf_event: Cleanup for cpu_clock_perf_event_update()
        perf_event: Allocate children's perf_event_ctxp at the right time
        perf_event: Clean up __perf_event_init_context()
        hw-breakpoints: Modify breakpoints without unregistering them
        perf probe: Update perf-probe document
        perf probe: Support --del option
        trace-kprobe: Support delete probe syntax
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm · c4e194e3
      Linus Torvalds authored
      * 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
        HTC Dream: mmc compilation fixes
        video: Allow selecting MSM framebuffer in Kconfig
        Add arm msm maintainer entry
        msm: Add memory map for HTC Dream
        msm: add minimal board file for HTC Dream device
        msm: make debugging UART (for DEBUG_LL) configurable
  2. 11 Dec, 2009 38 commits