git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
023dc70
f28510d
)
Merge branch 'slab/common-for-cgroups' into slab/for-linus
author
Pekka Enberg
<penberg@kernel.org>
Wed, 3 Oct 2012 06:56:37 +0000
(09:56 +0300)
committer
Pekka Enberg
<penberg@kernel.org>
Wed, 3 Oct 2012 06:56:37 +0000
(09:56 +0300)
Fix up a trivial conflict with NUMA_NO_NODE cleanups.
Conflicts:
mm/slob.c
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff