Arnd Bergmann 43872fa788 Merge branch 'depends/rmk/gpio' into next/fixes ...

This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2011-10-31 22:44:18 +01:00

..

chips

mtd: remove duplicate assignment of chip->state

2011-05-25 02:11:13 +01:00

devices

Change Ryan Mallon's email address across the kernel

2011-06-16 11:22:05 +02:00

lpddr

mtd: remove duplicate assignment of chip->state

2011-05-25 02:11:13 +01:00

maps

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

nand

ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h

2011-08-08 14:27:44 +01:00

onenand

ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h

2011-08-08 14:27:44 +01:00

tests

mtd: speedtest: fix integer overflow

2011-03-11 14:22:49 +00:00

ubi

UBI: do not link debug messages when debugging is disabled

2011-08-19 19:02:27 +03:00

afs.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

ar7part.c

[MTD] mtdpart: Make all partition parsers return allocated array

2009-03-20 18:55:17 +00:00

cmdlinepart.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

ftl.c

Update broken web addresses in the kernel.

2010-10-18 11:03:14 +02:00

inftlcore.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

inftlmount.c

mtd: Remove obsolete <mtd/compatmac.h> include

2010-08-08 21:19:42 +01:00

Kconfig

Merge git://git.infradead.org/mtd-2.6

2011-05-27 20:06:53 -07:00

Makefile

mtd: kill CONFIG_MTD_PARTITIONS

2011-05-25 02:25:35 +01:00

mtd_blkdevs.c

mtd: mtd_blkdevs: fix error path in blktrans_open

2011-05-25 01:53:45 +01:00

mtdblock_ro.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

mtdblock.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

mtdchar.c

VFS : mount lock scalability for internal mounts

2011-07-24 10:08:32 -04:00

mtdconcat.c

mtd: mtdconcat: fix NAND OOB write

2011-05-25 01:54:50 +01:00

mtdcore.c

mtd: remove add_mtd_partitions, add_mtd_device and friends

2011-05-25 02:25:16 +01:00

mtdcore.h

mtd: remove add_mtd_partitions, add_mtd_device and friends

2011-05-25 02:25:16 +01:00

mtdoops.c

Merge git://git.infradead.org/mtd-2.6

2011-01-17 11:15:30 -08:00

mtdpart.c

mtd: remove add_mtd_partitions, add_mtd_device and friends

2011-05-25 02:25:16 +01:00

mtdsuper.c

convert get_sb_mtd() users to ->mount()

2010-10-29 04:16:26 -04:00

mtdswap.c

mtd: mtdswap: fix possible null dereference

2011-05-25 02:11:44 +01:00

nftlcore.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

nftlmount.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

ofpart.c

mtd: Fix endianness issues from device tree

2010-10-25 00:55:56 +01:00

redboot.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

rfd_ftl.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

sm_ftl.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

sm_ftl.h

mtd: sm_ftl: cosmetic, use bool when possible

2010-10-25 01:33:08 +01:00

ssfdc.c

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00