diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-10-26 11:09:12 -0400 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-10-26 11:09:12 -0400 |
| commit | e182a345d40deba7c3165a2857812bf403818319 (patch) | |
| tree | 01cace799491cbb6bea19c10de971fd3a84d9868 /mm | |
| parent | 3cfef9524677a4ecb392d6fbffe6ebce6302f1d4 (diff) | |
| parent | fe353178653b15add8626f5474842601be160281 (diff) | |
| parent | dcc3be6a548a1e51adaab3be6d9dfbb68bc0e3a0 (diff) | |
Merge branches 'slab/next' and 'slub/partial' into slab/for-linus