summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2011-10-26 18:09:12 +0300
committerPekka Enberg <penberg@kernel.org>2011-10-26 18:09:12 +0300
commite182a345d40deba7c3165a2857812bf403818319 (patch)
tree01cace799491cbb6bea19c10de971fd3a84d9868
parent3cfef9524677a4ecb392d6fbffe6ebce6302f1d4 (diff)
parentfe353178653b15add8626f5474842601be160281 (diff)
parentdcc3be6a548a1e51adaab3be6d9dfbb68bc0e3a0 (diff)
downloadlinux-stable-e182a345d40deba7c3165a2857812bf403818319.tar.gz
linux-stable-e182a345d40deba7c3165a2857812bf403818319.tar.bz2
linux-stable-e182a345d40deba7c3165a2857812bf403818319.zip
Merge branches 'slab/next' and 'slub/partial' into slab/for-linus