diff options
| author | Mark Brown | 2011-04-18 18:12:14 +0200 |
|---|---|---|
| committer | Mark Brown | 2011-04-18 18:12:14 +0200 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /mm/slab.c | |
| parent | ARM: s3c2440: gta02; Register dfbmcs320 device for BT audio interface (diff) | |
| parent | Linux 2.6.39-rc3 (diff) | |
| download | kernel-qcow2-linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.gz kernel-qcow2-linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.xz kernel-qcow2-linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.zip | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slab.c b/mm/slab.c index 568803f121a8..46a9c163a92f 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -878,7 +878,7 @@ static struct array_cache *alloc_arraycache(int node, int entries, nc = kmalloc_node(memsize, gfp, node); /* * The array_cache structures contain pointers to free object. - * However, when such objects are allocated or transfered to another + * However, when such objects are allocated or transferred to another * cache the pointers are not cleared and they could be counted as * valid references during a kmemleak scan. Therefore, kmemleak must * not scan such objects. @@ -2606,7 +2606,7 @@ EXPORT_SYMBOL(kmem_cache_shrink); * * The cache must be empty before calling this function. * - * The caller must guarantee that noone will allocate memory from the cache + * The caller must guarantee that no one will allocate memory from the cache * during the kmem_cache_destroy(). */ void kmem_cache_destroy(struct kmem_cache *cachep) |