summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* x86: MMIOTRACE should not default to onLinus Torvalds2008-07-141-1/+0
* Merge branch 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2008-07-147-19/+151
|\
| * lockdep: fix kernel/fork.c warningIngo Molnar2008-07-141-1/+1
| * lockdep: fix ftrace irq tracing false positiveIngo Molnar2008-07-141-1/+2
| * Merge commit 'v2.6.26' into core/lockingIngo Molnar2008-07-142049-20460/+44512
| |\
| * | lockdep: remove duplicate definition of STATIC_LOCKDEP_MAP_INITLi Zefan2008-06-241-8/+0
| * | lockdep: add lock_class information to lock_chain and output itHuang, Ying2008-06-243-7/+17
| * | lockdep: add lock_class information to lock_chain and output itHuang, Ying2008-06-204-3/+135
| * | lockdep: output lock_class key instead of address for forward dependency outputHuang, Ying2008-06-131-1/+1
| * | __mutex_lock_common: use signal_pending_state()Oleg Nesterov2008-06-101-4/+1
| * | mutex-debug: check mutex magic before ownerJeremy Kerr2008-05-161-1/+1
* | | Merge branch 'sched/new-API-sched_setscheduler' of git://git.kernel.org/pub/s...Linus Torvalds2008-07-144-14/+40
|\ \ \
| * \ \ Merge branch 'linus' into sched/new-API-sched_setschedulerIngo Molnar2008-06-2549-499/+646
| |\ \ \
| * | | | sched: add new API sched_setscheduler_nocheck: add a flag to control access c...Rusty Russell2008-06-234-14/+40
* | | | | Merge branch 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2008-07-14100-115/+11490
|\ \ \ \ \
| * \ \ \ \ Merge branch 'auto-ftrace-next' into tracing/for-linusIngo Molnar2008-07-14100-115/+11490
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'tracing/ftrace' into auto-ftrace-nextIngo Molnar2008-07-148-10/+54
| | |\ \ \ \ \
| | | * | | | | ftrace: build fix for ftraced_suspendIngo Molnar2008-07-111-0/+2
| | | * | | | | ftrace: separate out the function enabled variableSteven Rostedt2008-07-111-3/+19
| | | * | | | | ftrace: add ftrace_kill_atomicSteven Rostedt2008-07-112-0/+16
| | | * | | | | ftrace: use current CPU for function startupSteven Rostedt2008-07-111-0/+3
| | | * | | | | ftrace: start wakeup tracing after setting function tracerSteven Rostedt2008-07-111-1/+2
| | | * | | | | ftrace: check proper config for preempt typeSteven Rostedt2008-07-111-1/+1
| | | * | | | | ftrace: trace scheduleSteven Rostedt2008-07-111-1/+1
| | | * | | | | ftrace: define function trace nopSteven Rostedt2008-07-111-2/+8
| | | * | | | | ftrace: move sched_switch enable after markersSteven Rostedt2008-07-111-2/+2
| | * | | | | | Merge branch 'tracing/sysprof' into auto-ftrace-nextIngo Molnar2008-07-106-0/+404
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'linus' into tracing/sysprofIngo Molnar2008-06-25325-5949/+10561
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | * | | | | | Merge branch 'linus' into tracing/sysprofIngo Molnar2008-06-16934-7298/+13670
| | | |\ \ \ \ \ \
| | | * | | | | | | sysprof: make it depend on X86Thomas Gleixner2008-05-241-1/+1
| | | * | | | | | | ftrace/sysprof: don't trace the user stack if we are a kernel thread.Soeren Sandmann2008-05-231-21/+29
| | | * | | | | | | sysprof: update copyrightsIngo Molnar2008-05-231-1/+1
| | | * | | | | | | sysprof: kernel traceSoeren Sandmann Pedersen2008-05-231-9/+80
| | | * | | | | | | ftrace: make it more available in the KconfigThomas Gleixner2008-05-231-1/+1
| | | * | | | | | | ftrace: fix __trace_special()Thomas Gleixner2008-05-231-4/+4
| | | * | | | | | | ftrace: remove notraceThomas Gleixner2008-05-231-5/+5
| | | * | | | | | | ftrace: sysprof updatesIngo Molnar2008-05-233-2/+73
| | | * | | | | | | ftrace: sysprof fixIngo Molnar2008-05-231-9/+19
| | | * | | | | | | ftrace: make sysprof dependent on x86 for nowIngo Molnar2008-05-232-6/+1
| | | * | | | | | | ftrace: sysprof plugin improvementIngo Molnar2008-05-231-6/+3
| | | * | | | | | | ftrace: sysprof-plugin, add self-testsIngo Molnar2008-05-233-3/+35
| | | * | | | | | | ftrace: extend sysprof plugin some moreIngo Molnar2008-05-231-4/+76
| | | * | | | | | | ftrace: extend sysprof pluginIngo Molnar2008-05-231-4/+63
| | | * | | | | | | ftrace: add sysprof pluginIngo Molnar2008-05-233-0/+89
| | * | | | | | | | Merge branch 'tracing/mmiotrace' into auto-ftrace-nextIngo Molnar2008-07-1017-66/+2274
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'tracing/mmiotrace-mergefixups' into tracing/mmiotraceIngo Molnar2008-07-071-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'linus' into tracing/mmiotrace-mergefixupsIngo Molnar2008-06-25325-5949/+10561
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / | | | | | |/| | | | | |
| | | | * | | | | | | | Merge branch 'linus' into tracing/mmiotrace-mergefixupsIngo Molnar2008-06-16934-7298/+13670
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / | | | | | |/| | | | | |
| | | | * | | | | | | | - fix mmioftrace + rcu merge interactionIngo Molnar2008-05-251-0/+1
| | | * | | | | | | | | Merge branch 'linus' into tracing/mmiotraceIngo Molnar2008-07-071421-14416/+33446
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |