]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a3fd013 964bc50)
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)
commitbfb1e8ca8d98e577f06a1b88e624bef7a870299a
tree7750d7ca27f373d1127439dc841171cdbb901a4atree | snapshot
parenta3fd0135bfcd866bfb9178815cd188f8e2156ed9commit | diff
parent964bc50652567243508a80b081ee1bfc21bd6d88commit | 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.