黄涛 ee25a425b9 Merge tag 'lsk-android-14.05' into develop-3.10 ...

lsk 14.05 android release

Conflicts:
	arch/arm/common/Kconfig
	arch/arm64/include/asm/arch_timer.h
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/usb/Kconfig

2014-06-12 21:04:26 +08:00

..

chips

Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd

2013-05-09 10:15:46 -07:00

devices

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

lpddr

…

maps

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

nand

Merge tag 'lsk-android-14.05' into develop-3.10

2014-06-12 21:04:26 +08:00

onenand

Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd

2013-05-09 10:15:46 -07:00

rknand

rk3188 : disable ddr freq && disable nand suspend && disable power onoff pll for sleep err

2014-03-17 01:55:06 -07:00

tests

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

ubi

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

afs.c

…

ar7part.c

mtd: Allow removal of partitioning modules

2013-02-04 09:27:33 +02:00

bcm47xxpart.c

mtd: bcm47xxpart: look for NVRAM at the end of device

2013-03-08 11:36:00 +00:00

bcm63xxpart.c

mtd: bcm63xxpart: use correct printk format for partitions

2012-11-21 17:15:06 +02:00

cmdlinepart.c

mtd: Allow removal of partitioning modules

2013-02-04 09:27:33 +02:00

ftl.c

…

inftlcore.c

…

inftlmount.c

…

Kconfig

add rknand for debug

2014-02-08 10:23:40 +08:00

Makefile

add rknand for debug

2014-02-08 10:23:40 +08:00

mtd_blkdevs.c

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

mtdblock_ro.c

rk: temp revert rk change

2013-11-08 21:33:42 +08:00

mtdblock.c

rk: temp revert rk change

2013-11-08 21:33:42 +08:00

mtdchar.c

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

mtdconcat.c

…

mtdcore.c

Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd

2013-05-09 10:15:46 -07:00

mtdcore.h

mtd: merge mtdchar module with mtdcore

2013-04-05 13:16:54 +01:00

mtdoops.c

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

mtdpart.c

mtd: mtdcore: use const qualifier

2013-04-05 13:04:27 +01:00

mtdsuper.c

…

mtdswap.c

…

nftlcore.c

…

nftlmount.c

…

ofpart.c

mtd: ofpart: support partitions of 4 GiB and larger

2013-04-05 12:05:53 +01:00

redboot.c

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

rfd_ftl.c

…

sm_ftl.c

mtd: sm_ftl: heap corruption in sm_create_sysfs_attributes()

2014-05-13 13:59:45 +02:00

sm_ftl.h

…

ssfdc.c

…