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)
commit69b26c7ad00fd5b6129400725e2ffb95134a0e1b
tree1986375f189313cc5a32560663c635e9110588c9
parentddb0c5a689c857bb13a42d9a3f0a7604497b3a29
parentcfe3fdadb16162327773ef01a575a32000b8c7f4
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