Merge branch 'linus' into tracing/urgent

Browse source

Merge reason: Merge up to almost-rc6 to pick up latest perfcounters
              (on which we'll queue up a dependent fix)

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

...

This commit is contained in:

Ingo Molnar 2009-08-09 12:46:45 +02:00

parent 26528e773e 7b2aa037e8

commit e3560336be

635 changed files with 21049 additions and 14193 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

151

kernel/cgroup.c

View file

27

kernel/fork.c

View file

2

kernel/kexec.c

View file

2

kernel/kprobes.c

View file

129

kernel/perf_counter.c

View file

7

kernel/posix-timers.c

View file

15

kernel/sched_cpupri.c

View file

32

kernel/sched_fair.c

View file

25

kernel/signal.c

View file

2

kernel/smp.c

View file

2

kernel/trace/trace_event_profile.c

View file

2

kernel/trace/trace_events.c

View file