projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9c3e132 5e0899d)
Merge tag 'for-linus-20150310' of git://git.infradead.org/linux-mtd
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Mar 2015 00:44:34 +0000 (17:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Mar 2015 00:44:34 +0000 (17:44 -0700)
commitcca28a5fda5d8fa69982bdb54341eeeb3eab215a
treeac563c15a31ea1dcdd4a67f01df3b85b58149913tree | snapshot
parent9c3e1323ecb382ef8731c7e7dc0891e4e00f9607commit | diff
parent5e0899db69e27abfdc1c6223ca74f479acdedaa6commit | 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
John Crispins staging tree