projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9ab4233 48f8b64)
Merge tag 'for-linus-20120706' of git://git.infradead.org/linux-mtd
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jul 2012 17:34:48 +0000 (10:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jul 2012 17:34:48 +0000 (10:34 -0700)
commitaf9b9a53fa0a86921edb86973f9661ccc7ddb90d
tree7750d7ca27f373d1127439dc841171cdbb901a4atree | snapshot
parent9ab4233dd08036fe34a89c7dc6f47a8bf2eb29ebcommit | diff
parent48f8b641297df49021093763a3271119a84990a2commit | diff
Merge tag 'for-linus-20120706' of git://git.infradead.org/linux-mtd

Pull two MTD fixes from David Woodhouse:
 - Fix a logic error in OLPC CAFÉ NAND ready() function.
 - Fix regression due to bitflip handling changes.

* tag 'for-linus-20120706' of git://git.infradead.org/linux-mtd:
  mtd: cafe_nand: fix an & vs | mistake
  mtd: nand: initialize bitflip_threshold prior to BBT scanning
John Crispins staging tree