summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2010-07-16 11:15:14 +0300
committerPekka Enberg <penberg@cs.helsinki.fi>2010-07-16 11:15:14 +0300
commit68d8b240899dd9dd5ec9350d8376772eab05f20c (patch)
tree2fd78b4c6645c8c5792d8e73fd6f9628fdda12d6 /mm
parentd602dabaeba79df90cc67c32d5fe4ee0d5e2b73a (diff)
parent7adde04a2f5a798f04a556dfb3b69bff388e5dc4 (diff)
parentaf537b0a6c650ab6ff7104d8163e96866b31c835 (diff)
Merge branches 'slob/fixes', 'slub/fixes' and 'slub/cleanups' into for-next