Merge git://git.infradead.org/mtd-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Aug 2010 19:47:05 +0000 (12:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Aug 2010 19:47:05 +0000 (12:47 -0700)
* 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


Trivial merge