summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2010-05-26ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34-gitBen Dooks
Update the s5pv210_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34-gitBen Dooks
Update the s5pc110_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s5pc100_defconfig: Update s5pc100_defconfig to v2.6.34-gitBen Dooks
Update the s5pc100_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34-gitBen Dooks
Update the s5p6442_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34-gitBen Dooks
Update the s5p6440_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34-gitBen Dooks
Update the s3c6400_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34-gitBen Dooks
Update the s3c2410_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-25Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits) ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900 ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline ARM: 6140/1: silence a bogus sparse warning in unwind.c ARM: mach-at91: duplicated include ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup ARM: SPEAR6xx: remove duplicated #include ARM: s3c6400_defconfig: Add NAND driver ARM: s3c6400_defconfig: enable sound as modules ARM: s3c6400_defconfig: enable power management ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34 ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34 ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34 ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34 ...
2010-05-25Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: spi/xilinx: Fix compile error spi/davinci: Fix clock prescale factor computation spi: move bitbang txrx utility functions to private header spi/mpc5121: Add SPI master driver for MPC5121 PSC powerpc/mpc5121: move PSC FIFO memory init to platform code spi/ep93xx: implemented driver for Cirrus EP93xx SPI controller Documentation/spi/* compile warning fix spi/omap2_mcspi: Check params before dereference or use spi/omap2_mcspi: add turbo mode support spi/omap2_mcspi: change default DMA_MIN_BYTES value to 160 spi/pl022: fix stop queue procedure spi/pl022: add support for the PL023 derivate spi/pl022: fix up differences between ARM and ST versions spi/spi_mpc8xxx: Do not use map_tx_dma to unmap rx_dma spi/spi_mpc8xxx: Fix QE mode Litte Endian spi/spi_mpc8xxx: fix potential memory corruption.
2010-05-25s3c rtc driver: add support for S3C64xxMaurus Cuelenaere
Add support for the S3C64xx SoC to the generic S3C RTC driver. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Acked-by: Ben Dooks <ben-linux@fluff.org> Cc: Frans Pop <elendil@planet.nl> Cc: Paul Gortmaker <p_gortmaker@yahoo.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-05-25Merge remote branch 'origin' into secretlab/next-spiGrant Likely
2010-05-25spi/ep93xx: implemented driver for Cirrus EP93xx SPI controllerMika Westerberg
This patch adds an SPI master driver for the Cirrus EP93xx SPI controller found in EP93xx chips. Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-24Merge branch 'master' into develRussell King
2010-05-24Merge branch 'devel-stable' into develRussell King
2010-05-24Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into ↵Russell King
devel-stable Conflicts: arch/arm/Kconfig
2010-05-24ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900wanzongshun
Add audio support part in arch/arm/mach-w90x900 Signed-off-by: Wan ZongShun<mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel ↵Alexander Holler
cmdline Add an option to force usage of the in-kernel cmdline even if the boot loader passes another command string to the kernel. Useful if someone cannot or don't want to change the command-line options of the boot loader but is able to change the kernel. Signed-off-by: Alexander Holler <holler@ahsoftware.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: 6140/1: silence a bogus sparse warning in unwind.cAlexander Shishkin
The check for compiler which is supposed to miscompile unwind tables clearly has nothing to do with sparse (which does not define necessary macros anyway), so simply silence it. Signed-off-by: Alexander Shishkin <virtuoso@slind.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: mach-at91: duplicated includeAndrea Gelmini
arch/arm/mach-at91/board-sam9m10g45ek.c: mach/hardware.h is included more than once Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanupAndrea Gelmini
arch/arm/nwfpe/fpsr.h:33: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanupAndrea Gelmini
arch/arm/mach-shark/pci.c:19: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:20: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:21: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:24: WARNING: externs should be avoided in .c files arch/arm/mach-shark/pci.c:28: WARNING: please, no space before tabs Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanupAndrea Gelmini
arch/arm/nwfpe/ChangeLog:75: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanupAndrea Gelmini
arch/arm/mach-sa1100/leds.c:21: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:21: WARNING: please, no space before tabs arch/arm/mach-sa1100/leds.c:22: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:22: WARNING: please, no space before tabs arch/arm/mach-sa1100/leds.c:24: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:24: WARNING: please, no space before tabs Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanupAndrea Gelmini
arch/arm/mach-h720x/common.h:17: WARNING: space prohibited between function name and open parenthesis '(' arch/arm/mach-h720x/common.h:23: WARNING: space prohibited between function name and open parenthesis '(' Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanupAndrea Gelmini
arch/arm/mach-footbridge/ebsa285-pci.c:22: ERROR: switch and case should be at the same indent Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanupAndrea Gelmini
arch/arm/mach-clps711x/Makefile.boot:2: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanupAndrea Gelmini
arch/arm/boot/bootp/bootp.lds:22: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: SPEAR6xx: remove duplicated #includeHuang Weiyi
Remove duplicated #include('s) in arch/arm/mach-spear6xx/spear6xx.c Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-23ARM: s3c6400_defconfig: Add NAND driverBen Dooks
Add the NAND driver to the list of inbuilt devices. Signed-of-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s3c6400_defconfig: enable sound as modulesBen Dooks
Add the ASoC/ALSA configuration for s3c6400_defconfig as modules Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s3c6400_defconfig: enable power managementBen Dooks
Enable power management in the default build Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34Ben Dooks
Update the s5pv210_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34Ben Dooks
Update the s5pc110_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34Ben Dooks
Update the s5p6442_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34Ben Dooks
Update the s5p6440_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34Ben Dooks
Update the s3c6400_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34Ben Dooks
Update the s3c2410_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s5pc100_defconfig: change ARCH_S5PC1XX to ARCH_S5PC100Ben Dooks
Fixup the defconfig post the latest moves, so ARCH_S5PC1XX becomes ARCH_S5PC100 which is sufficient to get the system building. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: S5PC100: Fixup merge problemsBen Dooks
Between problems with Kconfig and merging commits from several different sources, it seems the s5pc100 build's move from plat-s5pc11 has had a few problems. Since I do not have the trees to rebuild this quickly, the easiest thing is to simply fix the errors found once the s5pc100_defconfig actually builds. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: S5PC100: DMA: Add platform devices for PL330 DMACsJassi Brar
Samsung's Soc S5PC100 has three PL330 DMACs. First is dedicated for Memory->Memory data transfer while the other two meant for data transfer with peripherals. Define and add latter two PL330 DMACs as platform devices on the S5PC100 platform. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: S5PC100: Fix definition of IRQ_EINT()Ben Dooks
Somewhere during the latest platform cleanups the IRQ_EINT definition got broken, so fix it by replacing it in <mach/irqs.h> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: SAMSUNG: fix suspend/resume on if some GPIO banks not presentPinkava J
When saving GPIOs during suspend/resume we need skip missing GPIO banks, not trying get corresponding chip again and again in infinite loop. Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz> [ben-linux@fluff.org: shorten subject] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: Continue removing useless bootmem.h includesRussell King
Catch those which have been missed by 6262c92f because they were submitted via other routes. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-22Merge branch 'next' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: DMAENGINE: extend the control command to include an arg async_tx: trim dma_async_tx_descriptor in 'no channel switch' case DMAENGINE: DMA40 fix for allocation of logical channel 0 DMAENGINE: DMA40 support paused channel status dmaengine: mpc512x: Use resource_size DMA ENGINE: Do not reset 'private' of channel ioat: Remove duplicated devm_kzalloc() calls for ioatdma_device ioat3: disable cacheline-unaligned transfers for raid operations ioat2,3: convert to producer/consumer locking ioat: convert to circ_buf DMAENGINE: Support for ST-Ericssons DMA40 block v3 async_tx: use of kzalloc/kfree requires the include of slab.h dmaengine: provide helper for setting txstate DMAENGINE: generic channel status v2 DMAENGINE: generic slave control v2 dma: timb-dma: Update comment and fix compiler warning dma: Add timb-dma DMAENGINE: COH 901 318 fix bytesleft DMAENGINE: COH 901 318 rename confusing vars
2010-05-21Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linuxLinus Torvalds
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: (23 commits) OMAP: DSS2: Fix omap_dss_probe() error path OMAP: DSS2: omap_dss_probe() conditional compilation cleanup board-omap3-beagle: add DSS2 support OMAP2: DSS: Add missing line for update bg color OMAP3630: DSS2: Updating MAX divider value OMAP: RX51: Update board defconfig OMAP: DSS2: Add ACX565AKM Panel Driver OMAP: RX51: Add Touch Controller in SPI board info OMAP: RX51: Add LCD Panel support OMAP: DSS2: TPO-TD03MTEA1: fix Kconfig dependency OMAP: LCD LS037V7DW01: Add Backlight driver support OMAP: DSS2: Taal: Fix DSI bus locking problem OMAP: DSS2: Taal: add mutex to protect panel data OMAP: DSS2: Make partial update width even OMAP: DSS2: Fix device disable when driver is not loaded OMAP: DSS2: VENC: don't call platform_enable/disable() twice OMAP: DSS2: check lock_fb_info() return value OMAP: DSS2: fix lock_fb_info() and omapfb_lock() locking order OMAP: DSS2: Use vdds_sdi regulator supply in SDI OMAP: DSS2: Remove redundant enable/disable calls from SDI ...
2010-05-21Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (46 commits) random: simplify fips mode crypto: authenc - Fix cryptlen calculation crypto: talitos - add support for sha224 crypto: talitos - add hash algorithms crypto: talitos - second prepare step for adding ahash algorithms crypto: talitos - prepare for adding ahash algorithms crypto: n2 - Add Niagara2 crypto driver crypto: skcipher - Add ablkcipher_walk interfaces crypto: testmgr - Add testing for async hashing and update/final crypto: tcrypt - Add speed tests for async hashing crypto: scatterwalk - Fix scatterwalk_done() test crypto: hifn_795x - Rename ablkcipher_walk to hifn_cipher_walk padata: Use get_online_cpus/put_online_cpus in padata_free padata: Add some code comments padata: Flush the padata queues actively padata: Use a timer to handle remaining objects in the reorder queues crypto: shash - Remove usage of CRYPTO_MINALIGN crypto: mv_cesa - Use resource_size crypto: omap - OMAP macros corrected padata: Use get_online_cpus/put_online_cpus ... Fix up conflicts in arch/arm/mach-omap2/devices.c
2010-05-21Merge branch 'msm-mmc_sdcc' of ↵Linus Torvalds
git://codeaurora.org/quic/kernel/dwalker/linux-msm * 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm: drivers: mmc: msm_sdcc: Add EMBEDDED_SDIO support mmc: msm_sdcc: Fix issue where clocks could be disabled mid transaction mmc: msm_sdcc: Fix the dma exec function to use the proper delays mmc: msm_sdcc: Don't set host->curr.mrq until after we're sure the busclk timer won't fire mmc: msm_sdcc: Enable busclk idle timer for power savings mmc: msm_sdcc: Don't disable interrupts while suspending mmc: msm_sdcc: Fix issue where we might not end a sucessfull request mmc: msm_sdcc: Featurize busclock power save and disable it by default mmc: msm_sdcc: Fix bug where busclk expiry timer was not properly disabled mmc: msm_sdcc: Reduce command timeouts and improve reliability. mmc: msm_sdcc: Schedule clock disable after probe mmc: msm_sdcc: Wrap readl/writel calls with appropriate clk delays mmc: msm_sdcc: Driver clocking/irq improvements msm: Add 'execute' datamover callback mmc: msm_sdcc: Snoop SDIO_CCCR_ABORT register mmc: msm_sdcc: Clean up clock management and add a 10us delay after enabling clocks
2010-05-21Merge branch 'kdb-merge' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb * 'kdb-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: (25 commits) kdb,debug_core: Allow the debug core to receive a panic notification MAINTAINERS: update kgdb, kdb, and debug_core info debug_core,kdb: Allow the debug core to process a recursive debug entry printk,kdb: capture printk() when in kdb shell kgdboc,kdb: Allow kdb to work on a non open console port kgdb: Add the ability to schedule a breakpoint via a tasklet mips,kgdb: kdb low level trap catch and stack trace powerpc,kgdb: Introduce low level trap catching x86,kgdb: Add low level debug hook kgdb: remove post_primary_code references kgdb,docs: Update the kgdb docs to include kdb kgdboc,keyboard: Keyboard driver for kdb with kgdb kgdb: gdb "monitor" -> kdb passthrough sparc,sunzilog: Add console polling support for sunzilog serial driver sh,sh-sci: Use NO_POLL_CHAR in the SCIF polled console code kgdb,8250,pl011: Return immediately from console poll kgdb: core changes to support kdb kdb: core for kgdb back end (2 of 2) kdb: core for kgdb back end (1 of 2) kgdb,blackfin: Add in kgdb_arch_set_pc for blackfin ...
2010-05-21Merge branch 'omap-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (113 commits) omap4: Add support for i2c init omap: Fix i2c platform init code for omap4 OMAP2 clock: fix recursive spinlock attempt when CONFIG_CPU_FREQ=y OMAP powerdomain, hwmod, omap_device: add some credits OMAP4 powerdomain: Support LOWPOWERSTATECHANGE for powerdomains OMAP3 clock: add support for setting the divider for sys_clkout2 using clk_set_rate OMAP4 powerdomain: Fix pwrsts flags for ALWAYS ON domains OMAP: timers: Fix clock source names for OMAP4 OMAP4 clock: Support clk_set_parent OMAP4: PRCM: Add offset defines for all CM registers OMAP4: PRCM: Add offset defines for all PRM registers OMAP4: PRCM: Remove duplicate definition of base addresses OMAP4: PRM: Remove MPU internal code name and apply PRCM naming convention OMAP4: CM: Remove non-functional registers in ES1.0 OMAP: hwmod: Replace WARN by pr_warning for clockdomain check OMAP: hwmod: Rename hwmod name for the MPU OMAP: hwmod: Do not exit the iteration if one clock init failed OMAP: hwmod: Replace WARN by pr_warning if clock lookup failed OMAP: hwmod: Remove IS_ERR check with omap_clk_get_by_name return value OMAP: hwmod: Fix wrong pointer iteration in oh->slaves ...
2010-05-21Merge git://git.infradead.org/mtd-2.6Linus Torvalds
* git://git.infradead.org/mtd-2.6: (154 commits) mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips mtd: cfi_cmdset_0002: Fix MODULE_ALIAS and linkage for new 0701 commandset ID mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case value mtd: update gfp/slab.h includes jffs2: Stop triggering block erases from jffs2_write_super() jffs2: Rename jffs2_erase_pending_trigger() to jffs2_dirty_trigger() jffs2: Use jffs2_garbage_collect_trigger() to trigger pending erases jffs2: Require jffs2_garbage_collect_trigger() to be called with lock held jffs2: Wake GC thread when there are blocks to be erased jffs2: Erase pending blocks in GC pass, avoid invalid -EIO return jffs2: Add 'work_done' return value from jffs2_erase_pending_blocks() mtd: mtdchar: Do not corrupt backing device of device node inode mtd/maps/pcmciamtd: Fix printk format for ssize_t in debug messages drivers/mtd: Use kmemdup mtd: cfi_cmdset_0002: Fix argument order in bootloc warning mtd: nand: add Toshiba TC58NVG0 device ID pcmciamtd: add another ID pcmciamtd: coding style cleanups pcmciamtd: fixing obvious errors mtd: chips: add SST39WF160x NOR-flashes ... Trivial conflicts due to dev_node removal in drivers/mtd/maps/pcmciamtd.c