Linus Torvalds
57f2685c16
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
ARM: mach-shmobile: specify CHCLR registers on SH7372
dma: shdma: fix runtime PM: clear channel buffers on reset
dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
dmaengine/ste_dma40: clear LNK on channel startup
dmaengine: intel_mid_dma: remove legacy pm interface
ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
dmaengine: intel_mid_dma: error path fix
dmaengine: intel_mid_dma: locking and freeing fixes
mtd: gpmi-nand: move to dma_transfer_direction
mtd: fix compile error for gpmi-nand
mmc: mxs-mmc: fix the dma_transfer_direction migration
dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
dma: mxs-dma: fix a typo in comment
DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
video i.MX IPU: Fix display connections
i.MX IPU DMA: Fix wrong burstsize settings
dmaengine/ste_dma40: allow fixed physical channel
...
Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}
The conflicts looked pretty trivial, but I'll ask people to verify them.
|
2012-01-17 18:40:24 -08:00 |
| .. |
|
chips
|
mtd: introduce mtd_write interface
|
2012-01-09 18:25:20 +00:00 |
|
devices
|
MTD pull for 3.3
|
2012-01-10 13:45:22 -08:00 |
|
lpddr
|
mtd: lpddr: drop unnecessary zeroing
|
2012-01-09 18:24:48 +00:00 |
|
maps
|
mtd: do not use mtd->suspend and mtd->resume directly
|
2012-01-09 18:26:23 +00:00 |
|
nand
|
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
|
2012-01-17 18:40:24 -08:00 |
|
onenand
|
mtd: onenand: kill unused variable
|
2012-01-09 18:25:58 +00:00 |
|
tests
|
mtd: introduce mtd_can_have_bb helper
|
2012-01-09 18:26:24 +00:00 |
|
ubi
|
UBI: use own macros for the layout volume
|
2012-01-15 15:08:55 +02:00 |
|
afs.c
|
mtd: introduce mtd_read interface
|
2012-01-09 18:25:19 +00:00 |
|
ar7part.c
|
mtd: introduce mtd_read interface
|
2012-01-09 18:25:19 +00:00 |
|
bcm63xxpart.c
|
mtd: introduce mtd_read interface
|
2012-01-09 18:25:19 +00:00 |
|
cmdlinepart.c
|
Merge git://git.infradead.org/mtd-2.6
|
2011-11-07 09:11:16 -08:00 |
|
ftl.c
|
mtd: do not use mtd->sync directly
|
2012-01-09 18:26:21 +00:00 |
|
inftlcore.c
|
mtd: introduce mtd_write_oob interface
|
2012-01-09 18:25:24 +00:00 |
|
inftlmount.c
|
mtd: introduce mtd_block_markbad interface
|
2012-01-09 18:25:48 +00:00 |
|
Kconfig
|
mtd: maps: bcm963xx-flash: make CFE partition parsing an mtd parser
|
2012-01-09 18:15:31 +00:00 |
|
Makefile
|
mtd: maps: bcm963xx-flash: make CFE partition parsing an mtd parser
|
2012-01-09 18:15:31 +00:00 |
|
mtd_blkdevs.c
|
mtd: mtd_blkdevs: don't increase 'open' count on error path
|
2012-01-09 18:04:01 +00:00 |
|
mtdblock.c
|
mtd: do not use mtd->sync directly
|
2012-01-09 18:26:21 +00:00 |
|
mtdblock_ro.c
|
mtd: introduce mtd_write interface
|
2012-01-09 18:25:20 +00:00 |
|
mtdchar.c
|
mtd: do not use mtd->block_markbad directly
|
2012-01-09 18:26:26 +00:00 |
|
mtdconcat.c
|
mtd: do not use mtd->block_markbad directly
|
2012-01-09 18:26:26 +00:00 |
|
mtdcore.c
|
mtd: do not use mtd->suspend and mtd->resume directly
|
2012-01-09 18:26:23 +00:00 |
|
mtdcore.h
|
|
|
|
mtdoops.c
|
kexec: remove KMSG_DUMP_KEXEC
|
2012-01-12 20:13:11 -08:00 |
|
mtdpart.c
|
mtd: introduce mtd_block_markbad interface
|
2012-01-09 18:25:48 +00:00 |
|
mtdsuper.c
|
Merge git://git.infradead.org/mtd-2.6
|
2011-11-07 09:11:16 -08:00 |
|
mtdswap.c
|
mtd: do not use mtd->block_markbad directly
|
2012-01-09 18:26:26 +00:00 |
|
nftlcore.c
|
mtd: introduce mtd_can_have_bb helper
|
2012-01-09 18:26:24 +00:00 |
|
nftlmount.c
|
mtd: introduce mtd_block_markbad interface
|
2012-01-09 18:25:48 +00:00 |
|
ofpart.c
|
mtd: ofpart: add ofoldpart alias
|
2011-09-11 15:02:14 +03:00 |
|
redboot.c
|
mtd: introduce mtd_can_have_bb helper
|
2012-01-09 18:26:24 +00:00 |
|
rfd_ftl.c
|
mtd: do not use mtd->sync directly
|
2012-01-09 18:26:21 +00:00 |
|
sm_ftl.c
|
mtd: introduce mtd_has_oob helper
|
2012-01-09 18:26:08 +00:00 |
|
sm_ftl.h
|
|
|
|
ssfdc.c
|
mtd: introduce mtd_block_isbad interface
|
2012-01-09 18:25:47 +00:00 |