Merge commit 'v2.6.29-rc1' into tracing/urgent

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/slub.c b/mm/slub.c
index 509e96f..f657c88 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2285,7 +2285,7 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
 		 * Add some empty padding so that we can catch
 		 * overwrites from earlier objects rather than let
 		 * tracking information or the free pointer be
-		 * corrupted if an user writes before the start
+		 * corrupted if a user writes before the start
 		 * of the object.
 		 */
 		size += sizeof(void *);