Ingo Molnar 64edbc5620 Merge branch 'tracing/ftrace' into tracing/core ...

Merge reason: this mini-topic had outstanding problems that delayed
              its merge, so it does not fast-forward.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-06-04 13:59:40 +02:00

..

irq

Merge branch 'linus' into tracing/core

2009-05-07 11:17:34 +02:00

power

PM/Hibernate: Fix waiting for image device to appear on resume

2009-04-24 15:31:30 -07:00

time

clockevents: prevent endless loop in tick_handle_periodic()

2009-05-02 10:22:27 +02:00

trace

Merge branch 'tracing/ftrace' into tracing/core

2009-06-04 13:59:40 +02:00

.gitignore

…

acct.c

…

async.c

…

audit_tree.c

No need for crossing to mountpoint in audit_tag_tree()

2009-04-20 23:01:15 -04:00

audit.c

Audit: remove spaces from audit_log_d_path

2009-04-05 13:49:04 -04:00

audit.h

…

auditfilter.c

inotify: use GFP_NOFS in kernel_event() to work around a lockdep false-positive

2009-05-06 16:36:09 -07:00

auditsc.c

Audit: remove spaces from audit_log_d_path

2009-04-05 13:49:04 -04:00

backtracetest.c

…

bounds.c

…

capability.c

…

cgroup_debug.c

debug cgroup: remove unneeded cgroup_lock

2009-04-02 19:04:54 -07:00

cgroup_freezer.c

…

cgroup.c

Convert obvious places to deactivate_locked_super()

2009-05-09 10:49:40 -04:00

compat.c

…

configs.c

…

cpu.c

…

cpuset.c

cpusets: prevent PF_THREAD_BOUND tasks from attaching to non-root cpusets

2009-04-02 19:04:57 -07:00

cred-internals.h

…

cred.c

…

delayacct.c

…

dma-coherent.c

…

dma.c

…

exec_domain.c

…

exit.c

tracing/events: move trace point headers into include/trace/events

2009-04-14 22:05:43 -04:00

extable.c

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

fork.c

Merge branch 'tracing/hw-branch-tracing' into tracing/core

2009-05-07 13:36:22 +02:00

freezer.c

…

futex_compat.c

…

futex.c

futex: comment requeue key reference semantics

2009-04-02 23:39:53 +02:00

hrtimer.c

…

hung_task.c

…

itimer.c

…

kallsyms.c

…

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.preempt

…

kexec.c

kexec: vmcoreinfo_data[] can become static

2009-04-02 19:05:04 -07:00

kfifo.c

…

kgdb.c

sysrq, intel_fb: fix sysrq g collision

2009-05-15 07:56:24 -05:00

kmod.c

…

kprobes.c

kprobes: fix to use text_mutex around arm/disarm kprobe

2009-05-08 16:23:48 -07:00

ksysfs.c

…

kthread.c

tracing/events: move trace point headers into include/trace/events

2009-04-14 22:05:43 -04:00

latencytop.c

…

lockdep_internals.h

…

lockdep_proc.c

…

lockdep_states.h

…

lockdep.c

Merge branch 'linus' into tracing/core

2009-05-07 11:17:34 +02:00

Makefile

Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing

2009-04-24 10:11:23 +02:00

marker.c

…

module.c

ftrace: use module notifier for function tracer

2009-04-17 16:59:15 +02:00

mutex-debug.c

…

mutex-debug.h

…

mutex.c

mutex: have non-spinning mutexes on s390 by default

2009-04-09 19:28:24 +02:00

mutex.h

…

notifier.c

…

ns_cgroup.c

cgroups: relax ns_can_attach checks to allow attaching to grandchild cgroups

2009-04-02 19:04:53 -07:00

nsproxy.c

…

panic.c

Eliminate thousands of warnings with gcc 3.2 build

2009-05-06 16:36:09 -07:00

params.c

…

pid_namespace.c

signals: zap_pid_ns_process() should use force_sig()

2009-04-02 19:04:58 -07:00

pid.c

pids: refactor vnr/nr_ns helpers to make them safe

2009-04-02 19:05:02 -07:00

pm_qos_params.c

…

posix-cpu-timers.c

kernel/posix-cpu-timers.c: fix sparse warning

2009-04-30 08:08:31 +02:00

posix-timers.c

…

printk.c

Merge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 10:23:25 -07:00

profile.c

…

ptrace.c

Merge branch 'tracing/hw-branch-tracing' into tracing/core

2009-05-07 13:36:22 +02:00

rcuclassic.c

kmemtrace, rcu: fix linux/rcutree.h and linux/rcuclassic.h dependencies

2009-04-03 12:23:02 +02:00

rcupdate.c

RCU: Don't try and predeclare inline funcs as it upsets some versions of gcc

2009-04-15 13:55:14 -07:00

rcupreempt_trace.c

…

rcupreempt.c

kmemtrace, rcu: fix rcupreempt.c data structure dependencies

2009-04-03 12:23:04 +02:00

rcutorture.c

…

rcutree_trace.c

rcu: Make hierarchical RCU less IPI-happy

2009-04-14 11:31:50 +02:00

rcutree.c

rcu: Make hierarchical RCU less IPI-happy

2009-04-14 11:31:50 +02:00

rcutree.h

kmemtrace, rcu: fix rcu_tree_trace.c data structure dependencies

2009-04-03 12:23:03 +02:00

relay.c

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

res_counter.c

…

resource.c

Remove 'recurse into child resources' logic from 'reserve_region_with_split()'

2009-04-18 21:44:24 -07:00

rtmutex_common.h

…

rtmutex-debug.c

…

rtmutex-debug.h

…

rtmutex-tester.c

…

rtmutex.c

…

rtmutex.h

…

rwsem.c

…

sched_clock.c

Merge branch 'tracing/core-v2' into tracing-for-linus

2009-04-02 00:49:02 +02:00

sched_cpupri.c

…

sched_cpupri.h

…

sched_debug.c

…

sched_fair.c

…

sched_features.h

…

sched_idletask.c

…

sched_rt.c

Merge commit 'v2.6.30-rc1' into sched/urgent

2009-04-08 17:26:00 +02:00

sched_stats.h

…

sched.c

Merge branch 'tracing/hw-branch-tracing' into tracing/core

2009-05-07 13:36:22 +02:00

seccomp.c

…

semaphore.c

…

signal.c

tracing/events: move trace point headers into include/trace/events

2009-04-14 22:05:43 -04:00

slow-work.c

Delete slow-work timers properly

2009-04-24 07:47:59 -07:00

smp.c

…

softirq.c

Merge branch 'linus' into tracing/core

2009-05-07 11:17:34 +02:00

softlockup.c

…

spinlock.c

Allow rwlocks to re-enable interrupts

2009-04-02 19:05:11 -07:00

srcu.c

…

stacktrace.c

…

stop_machine.c

…

sys_ni.c

…

sys.c

kernel/sys.c: clean up sys_shutdown exit path

2009-04-13 15:04:32 -07:00

sysctl_check.c

…

sysctl.c

Revert "mm: add /proc controls for pdflush threads"

2009-05-15 11:32:24 +02:00

taskstats.c

…

test_kprobes.c

…

time.c

…

timeconst.pl

…

timer.c

Merge branches 'core-fixes-for-linus', 'irq-fixes-for-linus' and 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-09 10:35:30 -07:00

tracepoint.c

…

tsacct.c

…

uid16.c

…

up.c

…

user_namespace.c

…

user.c

…

utsname_sysctl.c

proc_sysctl: use CONFIG_PROC_SYSCTL around ipc and utsname proc_handlers

2009-04-02 19:05:01 -07:00

utsname.c

…

wait.c

…

workqueue.c

ftrace, workqueuetrace: make workqueue tracepoints use TRACE_EVENT macro

2009-06-02 01:10:40 +02:00