Skip to content
Snippets Groups Projects
Commit 018cbffe authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

Merge commit 'v2.6.33' into perf/core 

Merge reason:
	__percpu annotations need the corresponding sparse address
space definition upstream.

Conflicts:
	tools/perf/util/probe-event.c (trivial)
parents 1dd2980d 60b341b7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 159 additions and 64 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment