diff --git a/[refs] b/[refs] index 0da57e59d9c3..cb6794cc1252 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e6d444ea1f72b8148354a9baf0ea8fa3dd0425b +refs/heads/master: 7ae439ce0c01d7db0c70d1542985969e95ef750d diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index acda7e2d66e4..01262d26e192 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -3742,7 +3742,6 @@ EXPORT_SYMBOL(__kmalloc); /** * krealloc - reallocate memory. The contents will remain unchanged. - * * @p: object to reallocate memory for. * @new_size: how many bytes of memory are required. * @flags: the type of memory to allocate. diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index c81f52a72153..f7c120b93c41 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -2286,7 +2286,6 @@ EXPORT_SYMBOL(kmem_cache_shrink); /** * krealloc - reallocate memory. The contents will remain unchanged. - * * @p: object to reallocate memory for. * @new_size: how many bytes of memory are required. * @flags: the type of memory to allocate.