From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sun, 20 Sep 2009 12:55:36 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.32-rc1~160^2~3
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=6469f540ea37d53db089c8fea9c0c77a3d9353d4;p=net-next-2.6.git

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.
---

6469f540ea37d53db089c8fea9c0c77a3d9353d4
diff --cc drivers/mtd/mtdcore.c
index 3f559c0f187,69007a6eff5..467a4f177bf
--- a/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,
  };