git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1dd2980
60b341b
)
Merge commit 'v2.6.33' into perf/core
author
Frederic Weisbecker
<fweisbec@gmail.com>
Sat, 27 Feb 2010 15:18:46 +0000
(16:18 +0100)
committer
Frederic Weisbecker
<fweisbec@gmail.com>
Sat, 27 Feb 2010 15:18:46 +0000
(16:18 +0100)
Merge reason:
__percpu annotations need the corresponding sparse address
space definition upstream.
Conflicts:
tools/perf/util/probe-event.c (trivial)
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff