[GIT *] MTD fixes for 3.5

[David Woodhouse]

Linus, please pull from
	git://git.infradead.org/linux-mtd.git for-linus-20120706

Two MTD fixes for 3.5:
 - Fix a logic error in OLPC CAFÉ NAND ready() function.
 - Fix regression due to bitflip handling changes.

Dan Carpenter (1):
      mtd: cafe_nand: fix an & vs | mistake

Shmulik Ladkani (1):
      mtd: nand: initialize bitflip_threshold prior to BBT scanning

 drivers/mtd/nand/cafe_nand.c |    2 +-
 drivers/mtd/nand/nand_base.c |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

-- 
dwmw2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 6171 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-mtd/attachments/20120706/53eab7d0/attachment.bin>