diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2010-03-04 12:07:50 +0200 |
---|---|---|
committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2010-03-04 12:07:50 +0200 |
commit | e2b093f3e9262353558c6f89510ab2d286b28287 (patch) | |
tree | 298986520dcb4e60e5ab253b7f6d56277077215a /mm/slab.c | |
parent | eaa5eec739637f32f8733d528ff0b94fd62b1214 (diff) | |
parent | f3186a9c51eabe75b2780153ed7f07778d78b16e (diff) | |
parent | 4c13dd3b48fcb6fbe44f241eb11a057ecd1cba75 (diff) | |
parent | 44b57f1cc72a4a30b31f11b07a927d1534f1b93d (diff) | |
parent | 91efd773c74bb26b5409c85ad755d536448e229c (diff) | |
download | linux-3.10-e2b093f3e9262353558c6f89510ab2d286b28287.tar.gz linux-3.10-e2b093f3e9262353558c6f89510ab2d286b28287.tar.bz2 linux-3.10-e2b093f3e9262353558c6f89510ab2d286b28287.zip |
Merge branches 'slab/cleanups', 'slab/failslab', 'slab/fixes' and 'slub/percpu' into slab-for-linus