Colin Cross 98959c8563 Merge branch 'android-2.6.36' into android-tegra-2.6.36 ...

Conflicts:
	drivers/input/touchscreen/Kconfig

Change-Id: Ifc75266e258f9513d78c47c12e2f1de1d2344f02

2010-10-06 16:32:09 -07:00

..

chips

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

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

devices

mtd/tegra_nand: don't ignore return value for add_mtd_partitions

2010-10-06 16:27:07 -07:00

lpddr

mtd: change struct flchip_shared spinlock locking into mutex

2010-08-06 09:22:16 +01:00

maps

of: fix missing headers for of_address_to_resource() in MTD and SysACE drivers

2010-08-17 13:16:47 -06:00

nand

mtd: nand: Allow NAND chip ids to be included standalone.

2010-09-29 17:49:28 -07:00

onenand

mtd: OneNAND: Fix loop hang when DMA error at Samsung SoCs

2010-09-13 08:49:45 +01:00

tests

mtd: tests: return -1 if verify failed

2010-08-02 09:06:20 +01:00

ubi

UBI: do not oops when erroneous PEB is scheduled for scrubbing

2010-08-30 13:32:31 +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

mtd: Update copyright notices

2010-08-08 20:58:20 +01: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

mtd: update description on sm_ftl

2010-08-06 09:21:40 +01:00

Makefile

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

2010-05-10 14:32:46 +01:00

mtd_blkdevs.c

Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block

2010-08-10 15:22:42 -07:00

mtdblock_ro.c

mtd: Update copyright notices

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

mtdblock.c

mtd: Update copyright notices

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

mtdchar.c

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

2010-08-10 11:49:21 -07:00

mtdconcat.c

mtd: Update copyright notices

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

mtdcore.c

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

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

mtdcore.h

mtd: Replace static array of devices with an idr structure

2010-02-25 11:55:14 +00:00

mtdoops.c

mtd: Update copyright notices

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

mtdpart.c

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

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

mtdsuper.c

mtd: Update copyright notices

2010-08-08 20:58:20 +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: Update copyright notices

2010-08-08 20:58:20 +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

bitops: rename for_each_bit() to for_each_set_bit(): mtd

2010-04-08 09:42:41 +01:00

sm_ftl.h

mtd: Add new SmartMedia/xD FTL

2010-02-26 19:06:50 +00:00

ssfdc.c

mtd: Update copyright notices

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