tree 7750d7ca27f373d1127439dc841171cdbb901a4a
parent 9ab4233dd08036fe34a89c7dc6f47a8bf2eb29eb
parent 48f8b641297df49021093763a3271119a84990a2
author Linus Torvalds <torvalds@linux-foundation.org> 1341596088 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1341596088 -0700
mergetag object 48f8b641297df49021093763a3271119a84990a2
 type commit
 tag for-linus-20120706
 tagger David Woodhouse <David.Woodhouse@intel.com> 1341581858 +0100
 
 Two MTD fixes for 3.5:
 - Fix a logic error in OLPC CAFÉ NAND ready() function.
 - Fix regression due to bitflip handling changes.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iEYEABECAAYFAk/265wACgkQdwG7hYl686MWGgCfdnxPKE/cJnjVm5wxlp+hTBLv
 tbsAn3hpmrXhZNYNhQ+U34RDpw8V7SYc
 =IEqd
 -----END PGP SIGNATURE-----

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