summaryrefslogtreecommitdiffstats
path: root/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'v2.6.39-rc7' into perf/coreIngo Molnar2011-05-108-9/+37
|\
| * Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-05-072-1/+18
| |\
| | * Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tor...Ingo Molnar2011-05-061-1/+1
| | |\
| | * \ Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/f...Ingo Molnar2011-05-042-1/+18
| | |\ \
| | | * | ptrace: Prepare to fix racy accesses on task breakpointsFrederic Weisbecker2011-04-252-1/+18
| * | | | Regression: partial revert "tracing: Remove lock_depth from event entry"Arjan van de Ven2011-05-062-0/+2
| | |_|/ | |/| |
| * | | genirq: Fix typo CONFIG_GENIRC_IRQ_SHOW_LEVELGeert Uytterhoeven2011-05-021-1/+1
| |/ /
| * | Merge branch 'fixes-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-04-301-1/+7
| |\ \
| | * | workqueue: fix deadlock in worker_maybe_bind_and_lock()Tejun Heo2011-04-291-1/+7
| * | | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-04-301-1/+1
| |\ \ \
| * \ \ \ Merge branch 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2011-04-301-5/+5
| |\ \ \ \
| | * | | | hrtimer: Initialize CLOCK_ID to HRTIMER_BASE table staticallyThomas Gleixner2011-04-291-5/+5
| * | | | | kernel/watchdog.c: disable nmi perf event in the error path of enabling watchdogHillf Danton2011-04-281-1/+4
| |/ / / /
* | | | | perf events: Clean up definitions and initializers, update copyrightsIngo Molnar2011-05-041-20/+20
* | | | | hw breakpoints: Move to kernel/events/Borislav Petkov2011-05-033-2/+2
* | | | | perf: Start the restructuringBorislav Petkov2011-05-033-2/+8
* | | | | Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2011-05-011-209/+138Star
|\ \ \ \ \
| * | | | | ftrace: Consolidate the function match routines for normal and modsSteven Rostedt2011-04-301-62/+36Star
| * | | | | ftrace: Consolidate updating of ftrace_trace_functionSteven Rostedt2011-04-301-61/+34Star
| * | | | | ftrace: Move record update for normal and modules into a separate functionSteven Rostedt2011-04-301-8/+11
| * | | | | ftrace: Remove FTRACE_FL_CONVERTED flagSteven Rostedt2011-04-301-8/+4Star
| * | | | | ftrace: Remove FTRACE_FL_FAILED flagSteven Rostedt2011-04-301-29/+47
| * | | | | ftrace: Remove failures fileSteven Rostedt2011-04-301-37/+2Star
| * | | | | ftrace: Remove unnecessary disabling of irqsSteven Rostedt2011-04-301-4/+0Star
| * | | | | ftrace: Make FTRACE_WARN_ON() work in if conditionSteven Rostedt2011-04-301-6/+10
* | | | | | Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/g...Ingo Molnar2011-05-015-9/+27
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | ftrace: Only update the function code on write to filter filesSteven Rostedt2011-04-301-5/+7
| | |/ / / | |/| | |
| * | | | Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/g...Ingo Molnar2011-04-271-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | ftrace: Build without frame pointers on MicroblazeMichal Simek2011-04-211-1/+1
| * | | | Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa...Linus Torvalds2011-04-243-3/+19
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | PM: Add missing syscore_suspend() and syscore_resume() callsRafael J. Wysocki2011-04-201-0/+7
| | * | | PM: Fix error code paths executed after failing syscore_suspend()Rafael J. Wysocki2011-04-182-3/+12
* | | | | Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2011-04-276-352/+352
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | jump label: Introduce static_branch() interfaceJason Baron2011-04-043-337/+229Star
| * | | | tracing: Avoid soft lockup in trace_pipeJiri Olsa2011-04-042-3/+15
| * | | | tracing: Print trace_bprintk() formats for modules tooSteven Rostedt2011-04-041-6/+97
| * | | | tracing: Convert trace_printk() formats for module to const char *Steven Rostedt2011-04-041-6/+11
* | | | | Merge branch 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2011-04-191-15/+9Star
|\ \ \ \ \
| * | | | | posix clocks: Replace mutex with reader/writer semaphoreRichard Cochran2011-04-181-15/+9Star
| | |/ / / | |/| | |
* / | | | next_pidmap: fix overflow conditionLinus Torvalds2011-04-181-1/+4
|/ / / /
* | | | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-04-162-7/+13
|\ \ \ \
| * | | | block: make unplug timer trace event correspond to the schedule() unplugJens Axboe2011-04-161-6/+12
| * | | | block: let io_schedule() flush the plug inlineJens Axboe2011-04-161-1/+1
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
| \ \ \ \
*-----. \ \ \ \ Merge branches 'core-fixes-for-linus', 'perf-fixes-for-linus', 'sched-fixes-f...Linus Torvalds2011-04-163-9/+19
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | / / | | | |_|_|/ / | | |/| | | |
| | | * | | | sched: Fix erroneous all_pinned logicKen Chen2011-04-111-7/+4Star
| | | * | | | sched: Fix sched-domain avg_load calculationKen Chen2011-04-111-1/+2
| | | |/ / /
| | * | | | perf_event: Fix cgrp event scheduling bug in perf_enable_on_exec()Stephane Eranian2011-04-111-0/+12
| * | | | | futex: Set FLAGS_HAS_TIMEOUT during futex_wait restart setupDarren Hart2011-04-151-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-04-151-20/+3Star
|\ \ \ \ \
| * | | | | block: fixup block IO unplug trace callJens Axboe2011-04-121-3/+3