git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0729fbf
70ff055
)
Merge branch 'linus' into core/rcu
author
Ingo Molnar
<mingo@elte.hu>
Fri, 11 Jul 2008 08:46:50 +0000
(10:46 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 11 Jul 2008 08:46:50 +0000
(10:46 +0200)
Conflicts:
include/linux/rculist.h
kernel/rcupreempt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge