git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fd37617
773ff60
)
Merge branch 'topic/failslab' into for-linus
author
Pekka Enberg
<penberg@cs.helsinki.fi>
Mon, 29 Dec 2008 09:47:05 +0000
(11:47 +0200)
committer
Pekka Enberg
<penberg@cs.helsinki.fi>
Mon, 29 Dec 2008 09:47:05 +0000
(11:47 +0200)
Conflicts:
mm/slub.c
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Trivial merge