黄涛 b2be450f10 Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb ...

Conflicts:
	include/net/cfg80211.h

2012-08-21 14:14:24 +08:00

..

chips

mtd: remove duplicate assignment of chip->state

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

devices

mtd: m25p80: set writebufsize

2012-04-13 08:14:05 -07:00

lpddr

mtd: remove duplicate assignment of chip->state

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

maps

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

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

nand

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

2012-07-20 10:39:03 +08:00

onenand

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:09:59 +08:00

rknand

nand driver: add 2928 nand driver.

2012-08-07 15:27:26 +08:00

tests

mtd: tests: stresstest: bail out if device has not enough eraseblocks

2012-01-25 17:24:32 -08:00

ubi

UBI: fix eraseblock picking criteria

2012-04-02 09:27:17 -07:00

afs.c

mtd: Update copyright notices

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

ar7part.c

…

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 remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

2011-10-28 16:07:07 +08:00

Makefile

Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

2011-10-28 16:07:07 +08:00

mtd_blkdevs.c

Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb

2012-07-12 18:08:01 +08:00

mtdblock_ro.c

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36

2011-08-01 00:04:45 +08:00

mtdblock.c

Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

2011-10-28 16:07:07 +08:00

mtdchar.c

mtd: mtdchar: add missing initializer on raw write

2011-11-11 09:37:13 -08:00

mtdconcat.c

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:01:15 +08: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

mtd: mtdoops: skip reading initially bad blocks

2012-01-25 17:24:32 -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: provide an alias for the redboot module name

2011-11-11 09:37:15 -08:00

rfd_ftl.c

mtd: Update copyright notices

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

sm_ftl.c

mtd: sm_ftl: fix typo in major number.

2012-06-01 15:12:55 +08: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