summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2012-03-291-14/+11
|\
| * dmaengine/dma_slave: introduce inline wrappersAlexandre Bounine2012-03-211-14/+11
* | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-284-4/+0
|\ \
| * | Remove all #inclusions of asm/system.hDavid Howells2012-03-284-4/+0
* | | Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-281-38/+98
|\ \ \
| * \ \ Merge branch 'kirkwood/dt' into next/dt2Arnd Bergmann2012-03-241-22/+52
| |\ \ \
| * | | | atmel/nand: add DT supportJean-Christophe PLAGNIOL-VILLARD2012-03-151-20/+93
| * | | | mtd/atmel_nand: add on_flash_bbt to enable the use of On Flash BBTJean-Christophe PLAGNIOL-VILLARD2012-03-151-1/+1
| * | | | ATMEL: fix nand ecc supportJean-Christophe PLAGNIOL-VILLARD2012-03-151-19/+6
* | | | | Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-03-275-1/+6
|\ \ \ \ \
| * | | | | MTD: Relax dependenciesRichard Weinberger2012-03-255-1/+6
| |/ / / /
* | | | | Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-271-112/+0
|\ \ \ \ \
| * | | | | MTD: sa11x0: remove definitions and code left for documentation purposesRussell King2012-02-091-100/+0
| * | | | | MTD: sa11x0: Remove shutdown handlerRussell King2012-02-091-12/+0
| |/ / / /
* | | | | Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-271-22/+52
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | ARM: OMAP1: ams-delta: clean up init data section assignmentsJanusz Krzysztofik2012-03-011-1/+1
| * | | | Merge branch 'omap1' into ams-deltaTony Lindgren2012-03-011-22/+52
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'omap1-part2' into omap1Tony Lindgren2012-01-201-22/+52
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | MTD: NAND: ams-delta: use GPIO instead of custom I/OJanusz Krzysztofik2011-12-221-22/+52
* | | | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-271-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/ker...Olof Johansson2012-03-081-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XXKukjin Kim2012-03-031-1/+1
| | |/ / /
* | | | | mtd: use for_each_clear_bit()Akinobu Mita2012-03-231-4/+2
* | | | | magic.h: move some FS magic numbers into magic.hMuthu Kumar2012-03-231-1/+1
* | | | | Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubiLinus Torvalds2012-03-236-58/+49
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | UBI: rename MOVE_CANCEL_BITFLIPS to MOVE_TARGET_BITFLIPSArtem Bityutskiy2012-03-093-6/+6
| * | | | UBI: rename peb_buf1 to peb_bufArtem Bityutskiy2012-03-095-30/+30
| * | | | UBI: reduce memory consumptionJosselin Costanzi2012-03-093-12/+4
| * | | | UBI: fix eraseblock picking criteriaArtem Bityutskiy2012-03-091-6/+4
| * | | | UBI: fix documentation and improve readabilityArtem Bityutskiy2012-03-091-4/+5
| * | | | UBI: fix error handling in ubi_scan()Richard Weinberger2012-02-291-4/+4
| |/ / /
* | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2012-03-213-0/+1083
|\ \ \ \
| * | | | NAND Machine support for Integrated Flash ControllerPrabhakar Kushwaha2012-03-163-0/+1083
| |/ / /
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-03-201-4/+1
|\ \ \ \ | |/ / / |/| | |
| * | | mtd: simplify return logic in do_map_probe()Uwe Kleine-König2012-02-281-4/+1
| |/ /
* | | Merge tag 'for-linus-3.3' of git://git.infradead.org/~dwmw2/mtd-3.3Linus Torvalds2012-02-044-10/+57
|\ \ \ | |/ / |/| |
| * | Revert "mtd: atmel_nand: optimize read/write buffer functions"Artem Bityutskiy2012-02-041-4/+41
| * | mtd: fix MTD suspendArtem Bityutskiy2012-01-301-1/+1
| * | mtd: gpmi-nand bugfix: reset the BCH module when it is not MX23Huang Shijie2012-01-111-4/+14
| * | mtd: nand: fix typo in commentWolfram Sang2012-01-111-1/+1
* | | Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2012-01-171-10/+12
|\ \ \
| * | | mtd: gpmi-nand: move to dma_transfer_directionShawn Guo2011-12-231-10/+12
* | | | Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6Linus Torvalds2012-01-152-2/+5
|\ \ \ \
| * | | | UBI: use own macros for the layout volumeRichard Weinberger2012-01-151-2/+2
| * | | | UBI: fix nameless volumes handlingRichard Weinberger2012-01-151-0/+3
* | | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-01-141-175/+123
|\ \ \ \ \
| * | | | | MTD: nand: make au1550nd.c a platform_driverManuel Lauss2011-12-081-175/+123
| | |_|_|/ | |/| | |
* | | | | Merge tag 'for-linus' of git://github.com/rustyrussell/linuxLinus Torvalds2012-01-142-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | module_param: make bool parameters really bool (drivers & misc)Rusty Russell2012-01-132-2/+2
* | | | | Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6Linus Torvalds2012-01-132-2/+5
|\ \ \ \ \