diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-11 01:44:34 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-11 01:44:34 +0100 |
commit | cca28a5fda5d8fa69982bdb54341eeeb3eab215a (patch) | |
tree | ac563c15a31ea1dcdd4a67f01df3b85b58149913 /mm/memory.c | |
parent | Merge tag 'iommu-fixes-v4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | mtd: nand: MTD_NAND_HISI504 should depend on HAS_DMA (diff) | |
download | linux-cca28a5fda5d8fa69982bdb54341eeeb3eab215a.tar.xz linux-cca28a5fda5d8fa69982bdb54341eeeb3eab215a.zip |
Merge tag 'for-linus-20150310' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
* pxa3xx_nand
- fix timeout issues when draining the FIFO (BCH only)
- don't crash when no chip-selects are used
* hisi504_nand
- depend on HAS_DMA, to fix compile errors
* tag 'for-linus-20150310' of git://git.infradead.org/linux-mtd:
mtd: nand: MTD_NAND_HISI504 should depend on HAS_DMA
mtd: pxa3xx_nand: fix driver when num_cs is 0
mtd: nand: pxa3xx: Fix PIO FIFO draining
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions