Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

This commit is contained in:
David Woodhouse
2007-01-18 10:34:51 +11:00
5553 changed files with 242541 additions and 122134 deletions
+1 -1
View File
@@ -768,7 +768,7 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
if (mtd->type != MTD_NORFLASH)
return;
part = kcalloc(1, sizeof(struct partition), GFP_KERNEL);
part = kzalloc(sizeof(struct partition), GFP_KERNEL);
if (!part)
return;