Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 26 Mar 2010 14:55:59 +0000 (14:55 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 26 Mar 2010 14:55:59 +0000 (14:55 +0000)
commit329f9052dbadf6f4afe2231668bd00c579a4aa10
treee080a5c70df40f3ae8cf28a95a3267757668ab97
parent395b228858778d3c44f7c413693a6acaa8bb62dc
parent220bf991b0366cc50a94feede3d7341fa5710ee4
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
drivers/mtd/nand/sh_flctl.c

Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().
12 files changed:
MAINTAINERS
arch/arm/mach-ep93xx/include/mach/ts72xx.h
arch/arm/mach-ep93xx/ts72xx.c
drivers/mtd/inftlcore.c
drivers/mtd/maps/pismo.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/au1550nd.c
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/mxc_nand.c
drivers/mtd/nand/omap2.c
drivers/mtd/nand/sh_flctl.c
lib/idr.c