Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/soc

* 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6: (604 commits)
  ARM: LPC32xx: defconfig update: Cleanup (EXPERIMENTAL)
  ARM: LPC32xx: defconfig update: Remove the museum NAND option
  ARM: LPC32xx: defconfig update: Default drivers and cleanup
  ARM: LPC32xx: defconfig update: gpio and keys
  + Linux 3.9-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/Kconfig

1 files changed, 1 insertions, 3 deletions

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 194113b1b11b..f8a23c3078f8 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -1147,8 +1147,7 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
                                                          "on filesystem root.");
                                         return 0;
                                 }
-                                qf_names[qtype] =
-                                    kmalloc(strlen(arg) + 1, GFP_KERNEL);
+                                qf_names[qtype] = kstrdup(arg, GFP_KERNEL);
                                 if (!qf_names[qtype]) {
                                         reiserfs_warning(s, "reiserfs-2502",
                                                          "not enough memory "
@@ -1156,7 +1155,6 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
                                                          "quotafile name.");
                                         return 0;
                                 }
-                                strcpy(qf_names[qtype], arg);
                                 if (qtype == USRQUOTA)
                                         *mount_options |= 1 << REISERFS_USRQUOTA;
                                 else