| commit | af9b9a53fa0a86921edb86973f9661ccc7ddb90d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 06 10:34:48 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 06 10:34:48 2012 -0700 |
| tree | 7750d7ca27f373d1127439dc841171cdbb901a4a | |
| parent | 9ab4233dd08036fe34a89c7dc6f47a8bf2eb29eb [diff] | |
| parent | 48f8b641297df49021093763a3271119a84990a2 [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