summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2010-05-22 10:57:52 +0300
committerPekka Enberg <penberg@cs.helsinki.fi>2010-05-22 10:57:52 +0300
commitbb4f6b0cd7524ad7d56709723eaf8a7bf5a87b57 (patch)
treedf58d2c4c1f01f9bf5aa19e6a6d329b872b1f72a
parentf4b87dee923342505e1ddba8d34ce9de33e75050 (diff)
parentec49fdbd354cb133340e25ff84d88284bb17e99a (diff)
parente92dd4fd1aa1cd081dac03973b33c972637d5b7a (diff)
parent5c5e3b33b7cb959a401f823707bee006caadd76e (diff)
parent8f9f8d9e8080a2ff46caa7decef47810d093d252 (diff)
parent6b65aaf3027c4e02b42aaefd900aa79136a30681 (diff)
downloadlinux-bb4f6b0cd7524ad7d56709723eaf8a7bf5a87b57.tar.bz2
Merge branches 'slab/align', 'slab/cleanups', 'slab/fixes', 'slab/memhotadd' and 'slub/fixes' into slab-for-linus