From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Aug 2010 19:47:05 +0000 (-0700)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lisovros/linux_canprio.git/commitdiff_plain/69b26c7ad00fd5b6129400725e2ffb95134a0e1b

Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  mtd: nand: Fix probe of Samsung NAND chips
  mtd: nand: Fix regression in BBM detection
  pxa3xx: fix ns2cycle equation
---

69b26c7ad00fd5b6129400725e2ffb95134a0e1b