summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2010-03-04 13:07:50 +0300
committerPekka Enberg <penberg@cs.helsinki.fi>2010-03-04 13:07:50 +0300
commite2b093f3e9262353558c6f89510ab2d286b28287 (patch)
tree298986520dcb4e60e5ab253b7f6d56277077215a
parenteaa5eec739637f32f8733d528ff0b94fd62b1214 (diff)
parentf3186a9c51eabe75b2780153ed7f07778d78b16e (diff)
parent4c13dd3b48fcb6fbe44f241eb11a057ecd1cba75 (diff)
parent44b57f1cc72a4a30b31f11b07a927d1534f1b93d (diff)
parent91efd773c74bb26b5409c85ad755d536448e229c (diff)
downloadlinux-e2b093f3e9262353558c6f89510ab2d286b28287.tar.xz
Merge branches 'slab/cleanups', 'slab/failslab', 'slab/fixes' and 'slub/percpu' into slab-for-linus