tree 1986375f189313cc5a32560663c635e9110588c9
parent ddb0c5a689c857bb13a42d9a3f0a7604497b3a29
parent cfe3fdadb16162327773ef01a575a32000b8c7f4
author Linus Torvalds <torvalds@linux-foundation.org> 1282420025 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282420025 -0700

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