Merge branch 'master' into for-2.6.34

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c
index 1386e6f081c8..23916321cc1b 100644
--- a/arch/mips/vr41xx/common/init.c
+++ b/arch/mips/vr41xx/common/init.c
@@ -1,7 +1,7 @@
 /*
  *  init.c, Common initialization routines for NEC VR4100 series.
  *
- *  Copyright (C) 2003-2008  Yoichi Yuasa <yuasa@linux-mips.org>
+ *  Copyright (C) 2003-2009  Yoichi Yuasa <yuasa@linux-mips.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -66,9 +66,9 @@ void __init prom_init(void)
         argv = (char **)fw_arg1;
 
         for (i = 1; i < argc; i++) {
-                strcat(arcs_cmdline, argv[i]);
+                strlcat(arcs_cmdline, argv[i], COMMAND_LINE_SIZE);
                 if (i < (argc - 1))
-                        strcat(arcs_cmdline, " ");
+                        strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE);
         }
 }