]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d1f1edc fee466f)
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)
commit262dc13dd03d939b4e3d70cb906ebc855c29bdcc
tree7750d7ca27f373d1127439dc841171cdbb901a4atree | snapshot
parentd1f1edc98e1b9d78c65868287632d671d7437092commit | diff
parentfee466f9156a7aa2c31751b3474c5c87442874d9commit | 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
Linux Kernel Source Tree.