From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Jul 2012 17:34:48 +0000 (-0700)
Subject: Merge tag 'for-linus-20120706' of git://git.infradead.org/linux-mtd
X-Git-Tag: v3.5-rc6~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=af9b9a53fa0a86921edb86973f9661ccc7ddb90d;p=karo-tx-linux.git

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
---

af9b9a53fa0a86921edb86973f9661ccc7ddb90d