| commit | cca28a5fda5d8fa69982bdb54341eeeb3eab215a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Mar 10 17:44:34 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Mar 10 17:44:34 2015 -0700 |
| tree | ac563c15a31ea1dcdd4a67f01df3b85b58149913 | |
| parent | 9c3e1323ecb382ef8731c7e7dc0891e4e00f9607 [diff] | |
| parent | 5e0899db69e27abfdc1c6223ca74f479acdedaa6 [diff] |
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