summaryrefslogtreecommitdiffstats
path: root/kernel (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linus' into cpus4096Ingo Molnar2008-12-172-4/+4
|\
| * cgroups: fix a race between rmdir and remountPaul Menage2008-12-161-1/+1
| * Revert "sched_clock: prevent scd->clock from moving backwards"Linus Torvalds2008-12-151-3/+3
* | Merge ../linux-2.6-x86Rusty Russell2008-12-1356-1778/+5767
|\ \
| | \
| | \
| | \
| | \
| *---. \ Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096Ingo Molnar2008-12-125-8/+202
| |\ \ \ \
| | * | | | x86: use NR_IRQS_LEGACYYinghai Lu2008-12-081-3/+3
| | * | | | sparse irq_desc[] array: core kernel and x86 changesYinghai Lu2008-12-085-8/+202
| | |/ / /
| * | | | Merge branch 'sched/core' into cpus4096Ingo Molnar2008-12-1213-71/+149
| |\ \ \ \
| | * | | | sched: add missing arch_update_cpu_topology() callHeiko Carstens2008-12-121-2/+6
| | * | | | sched: let arch_update_cpu_topology indicate if topology changedHeiko Carstens2008-12-121-1/+7
| | * | | | Merge commit 'v2.6.28-rc8' into sched/coreIngo Molnar2008-12-1212-28/+94
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | sched: idle_balance() does not call load_balance_newidle()Vaidyanathan Srinivasan2008-12-081-1/+1
| | * | | | sched: fix sd_parent_degenerate on non-numa smp machineKen Chen2008-12-081-0/+2
| | * | | | Merge branch 'sched/urgent' into sched/coreIngo Molnar2008-12-0813-55/+88
| | |\ \ \ \
| | * | | | | sched: add uid information to sched_debug for CONFIG_USER_SCHEDArun R Bharadwaj2008-12-013-1/+17
| | * | | | | sched: move double_unlock_balance() higherAlexey Dobriyan2008-11-282-38/+33
| | * | | | | Merge branch 'sched/urgent' into sched/coreIngo Molnar2008-11-281-2/+3
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'tracing/fastboot' into cpus4096Ingo Molnar2008-12-1219-348/+2132
| |\ \ \ \ \ \ \
| | * | | | | | | tracing/function-graph-tracer: fix 'flags' variable mismatchIngo Molnar2008-12-081-3/+3
| | * | | | | | | tracing/function-graph-tracer: append the tracing_graph_flagFrederic Weisbecker2008-12-082-13/+7
| | * | | | | | | tracing/function-graph-tracer: turn tracing_selftest_running into an intFrederic Weisbecker2008-12-081-5/+7
| | * | | | | | | tracing/function-graph-tracer: introduce __notrace_funcgraph to filter specia...Frederic Weisbecker2008-12-083-7/+4
| | * | | | | | | tracing/function-graph-tracer: implement a print_headers functionFrederic Weisbecker2008-12-081-4/+29
| | * | | | | | | ftrace: use init_struct_pid as swapper pidSteven Rostedt2008-12-051-1/+1
| | * | | | | | | tracing/ftrace: provide the macro task_curr_ret_stack()Frederic Weisbecker2008-12-051-7/+1
| | * | | | | | | tracing/ftrace: fix the check of ftrace_trace_taskFrederic Weisbecker2008-12-051-1/+1
| | * | | | | | | tracing/ftrace: don't insert TRACE_PRINT during selftestsFrederic Weisbecker2008-12-051-1/+12
| | | | | | | | |
| | | \ \ \ \ \ \
| | *-. \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing...Ingo Molnar2008-12-054-9/+97
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | tracing/function-graph-tracer: handle ftrace_printk entriesFrederic Weisbecker2008-12-044-9/+97
| | * | | | | | | | | ftrace: avoid duplicated function when writing set_graph_functionLiming Wang2008-12-041-2/+8
| | * | | | | | | | | tracing: fix typo and missing inline functionIngo Molnar2008-12-041-1/+5
| | * | | | | | | | | ftrace: add ability to only trace swapper tasksSteven Rostedt2008-12-041-11/+63
| | * | | | | | | | | ftrace: use struct pidSteven Rostedt2008-12-042-34/+46
| | * | | | | | | | | ftrace: trace single pid for function graph tracerSteven Rostedt2008-12-043-1/+14
| | * | | | | | | | | ftrace: use task struct trace flag to filter on pidSteven Rostedt2008-12-041-3/+25
| | * | | | | | | | | ftrace: graph of a single functionSteven Rostedt2008-12-043-1/+264
| | |/ / / / / / / /
| | | | | | | | | |
| | | \ \ \ \ \ \ \
| | *-. \ \ \ \ \ \ \ Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into trac...Ingo Molnar2008-12-0410-115/+425
| | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | tracing/function-graph-tracer: enabled by defaultIngo Molnar2008-12-031-0/+1
| | | * | | | | | | | | ftrace: fix race in function graph during forkSteven Rostedt2008-12-031-3/+6
| | | * | | | | | | | | trace: fix output of stack traceSteven Rostedt2008-12-031-1/+4
| | | * | | | | | | | | tracing/function-graph-tracer: improve duration outputFrederic Weisbecker2008-12-031-12/+43
| | | * | | | | | | | | tracing/function-graph-tracer: display unified style cmdline and pidFrederic Weisbecker2008-12-031-14/+99
| | | * | | | | | | | | ftrace: function graph return for function entrySteven Rostedt2008-12-033-5/+11
| | | * | | | | | | | | ring-buffer: change "page" variable names to "bpage"Steven Rostedt2008-12-031-65/+65
| | | * | | | | | | | | ftrace: add ftrace_graph_stop()Steven Rostedt2008-12-031-0/+5
| | | * | | | | | | | | ring-buffer: read page interfaceSteven Rostedt2008-12-031-0/+166
| | | * | | | | | | | | ring-buffer: move some metadata into buffer pageSteven Rostedt2008-12-031-27/+36
| | | * | | | | | | | | ftrace: replace raw_local_irq_save with local_irq_saveSteven Rostedt2008-12-034-12/+13
| | | | | | | | | | | |
| | | | \ \ \ \ \ \ \ \
| | | *-. \ \ \ \ \ \ \ \ Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftraceIngo Molnar2008-12-0312-37/+78
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | / / / / / / / | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | * | | | | | | | | | Merge commit 'v2.6.28-rc7' into tracing/coreIngo Molnar2008-12-0412-37/+78
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| / / / / / / / / | | | |/ / / / / / / /