Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tracing/hw-branch-tracing' into tracing/core | Ingo Molnar | 2009-05-07 | 1 | -0/+43 |
|\ | |||||
| * | Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing | Ingo Molnar | 2009-04-24 | 1 | -15/+149 |
| |\ | |||||
| * | | sched, hw-branch-tracer: add wait_task_context_switch() function to sched.h | Markus Metzger | 2009-04-07 | 1 | -0/+43 |
* | | | Merge branch 'linus' into tracing/core | Ingo Molnar | 2009-05-07 | 1 | -4/+8 |
|\ \ \ | |||||
| * | | | sched: account system time properly | Eric Dumazet | 2009-04-29 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | sched: Avoid printing sched_group::__cpu_power for default case | Gautham R Shenoy | 2009-04-17 | 1 | -2/+6 |
| * | | tracing, sched: mark get_parent_ip() notrace | Lai Jiangshan | 2009-04-14 | 1 | -1/+1 |
* | | | tracepoint: trace_sched_migrate_task(): remove parameter | Mathieu Desnoyers | 2009-05-06 | 1 | -1/+1 |
* | | | tracing/events: move trace point headers into include/trace/events | Steven Rostedt | 2009-04-14 | 1 | -1/+1 |
* | | | tracing: create automated trace defines | Steven Rostedt | 2009-04-14 | 1 | -7/+3 |
|/ / | |||||
* | | Merge commit 'v2.6.30-rc1' into sched/urgent | Ingo Molnar | 2009-04-08 | 1 | -353/+788 |
|\ \ | |/ | |||||
| * | Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... | Linus Torvalds | 2009-04-06 | 1 | -3/+11 |
| |\ | |||||
| | * | hrtimer: fix rq->lock inversion (again) | Peter Zijlstra | 2009-03-31 | 1 | -3/+11 |
| * | | Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... | Linus Torvalds | 2009-04-05 | 1 | -4/+4 |
| |\ \ | |||||
| | * \ | Merge branch 'tracing/core-v2' into tracing-for-linus | Ingo Molnar | 2009-04-02 | 1 | -4/+4 |
| | |\ \ | |||||
| | | * \ | Merge branch 'x86/core' into tracing/textedit | Ingo Molnar | 2009-03-06 | 1 | -9/+4 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'core/locking' into tracing/ftrace | Ingo Molnar | 2009-03-04 | 1 | -3/+68 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core | Ingo Molnar | 2009-03-04 | 1 | -3/+12 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'linus' into tracing/blktrace | Ingo Molnar | 2009-02-19 | 1 | -3/+12 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 't... | Ingo Molnar | 2009-02-13 | 1 | -16/+11 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge commit 'v2.6.29-rc4' into tracing/core | Ingo Molnar | 2009-02-09 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing... | Ingo Molnar | 2009-02-03 | 1 | -0/+10 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | trace, lockdep: manual preempt count adding for local_bh_disable | Steven Rostedt | 2009-01-23 | 1 | -4/+4 |
| * | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask | Linus Torvalds | 2009-04-05 | 1 | -21/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... | Rusty Russell | 2009-03-31 | 1 | -21/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge branch 'linus' into cpumask-for-linus | Ingo Molnar | 2009-03-30 | 1 | -289/+692 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | cpumask: remove cpumask allocation from idle_balance, fix | Rusty Russell | 2009-03-19 | 1 | -1/+1 |
| | | * | | | | | | | | | | | cpumask: remove cpumask allocation from idle_balance | Rusty Russell | 2009-03-19 | 1 | -17/+18 |
| | | * | | | | | | | | | | | cpumask: use topology_core_cpumask/topology_thread_cpumask instead of cpu_cor... | Rusty Russell | 2009-03-13 | 1 | -4/+4 |
| | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... | Linus Torvalds | 2009-04-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'x86/core' into core/ipi | Ingo Molnar | 2009-03-13 | 1 | -9/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge branch 'x86/urgent' into x86/core | Ingo Molnar | 2009-03-05 | 1 | -3/+12 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'linus' into core/ipi | Ingo Molnar | 2009-03-13 | 1 | -3/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | generic-ipi: remove CSD_FLAG_WAIT | Peter Zijlstra | 2009-02-25 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | epoll keyed wakeups: add __wake_up_locked_key() and __wake_up_sync_key() | Davide Libenzi | 2009-04-01 | 1 | -4/+19 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... | Linus Torvalds | 2009-03-30 | 1 | -3/+68 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | sched: fix errors in struct & function comments | Randy Dunlap | 2009-03-29 | 1 | -7/+8 |
| * | | | | | | | | | Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 | Ingo Molnar | 2009-03-27 | 1 | -9/+4 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/... | Ingo Molnar | 2009-02-24 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | alloc_percpu: change percpu_ptr to per_cpu_ptr | Rusty Russell | 2009-02-20 | 1 | -3/+3 |
| | | * | | | | | | | | Merge commit 'v2.6.29-rc4' into core/percpu | Ingo Molnar | 2009-02-09 | 1 | -2/+12 |
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | | | |||||
| | * | | | | | | | | | Merge branch 'linus' into x86/apic | Ingo Molnar | 2009-02-22 | 1 | -3/+12 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'linus' into x86/apic | Ingo Molnar | 2009-02-13 | 1 | -18/+13 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'x86/urgent' into x86/apic | Ingo Molnar | 2009-02-05 | 1 | -0/+10 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | / | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | * | | | | | | | | Merge branch 'x86/mm' into core/percpu | Ingo Molnar | 2009-01-21 | 1 | -18/+25 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | * | | | | | | | | Merge branch 'core/percpu' into stackprotector | Ingo Molnar | 2009-01-18 | 1 | -479/+639 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'linus' into stackprotector | Ingo Molnar | 2008-12-31 | 1 | -239/+301 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'linus' into stackprotector | Ingo Molnar | 2008-10-15 | 1 | -590/+1094 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'linus' into stackprotector | Ingo Molnar | 2008-06-25 | 1 | -425/+92 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | stackprotector: use canary at end of stack to indicate overruns at oops time | Eric Sandeen | 2008-05-26 | 1 | -6/+1 |