git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c53badd
a24c5a0
)
Merge branch 'slub/lockless' into for-linus
author
Pekka Enberg
<penberg@kernel.org>
Sun, 20 Mar 2011 16:13:26 +0000
(18:13 +0200)
committer
Pekka Enberg
<penberg@kernel.org>
Sun, 20 Mar 2011 16:13:26 +0000
(18:13 +0200)
Conflicts:
include/linux/slub_def.h
Trivial merge