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

Conflicts:
	drivers/mtd/mtdcore.c

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

diff --cc arch/arm/mach-omap2/board-apollon.c
Simple merge

diff --cc drivers/mtd/mtdblock.c
Simple merge

diff --cc drivers/mtd/mtdcore.c
index 3f559c0,69007a6..467a4f1
--- 1/drivers/mtd/mtdcore.c
--- 2/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@@ -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,
  };

diff --cc drivers/mtd/mtdpart.c
Simple merge