Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
David Woodhouse [Sun, 20 Sep 2009 12:55:36 +0000 (05:55 -0700)]
Conflicts:
drivers/mtd/mtdcore.c

Merged in order that I can apply the Nomadik nand/onenand support patches.

1  2 
arch/arm/mach-omap2/board-apollon.c
drivers/mtd/mtdblock.c
drivers/mtd/mtdcore.c
drivers/mtd/mtdpart.c

Simple merge
Simple merge
@@@ -217,7 -217,7 +217,7 @@@ static struct attribute_group mtd_grou
        .attrs          = mtd_attrs,
  };
  
- static struct attribute_group *mtd_groups[] = {
 -const struct attribute_group *mtd_groups[] = {
++static const struct attribute_group *mtd_groups[] = {
        &mtd_group,
        NULL,
  };
Simple merge