Merge git://git.infradead.org/~dwmw2/mtd-2.6.26
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Jun 2008 21:25:48 +0000 (14:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Jun 2008 21:25:48 +0000 (14:25 -0700)
commit698f7a4a12c15fef354b2a1ac14f90a0e71008d9
treee8332a80e1ca588a374647111c20b4aa2ee36aac
parentadbd5886da5f467148b26cca3728ab0e672b3fcc
parentba75321193900a236bc5bbc29145e1039f74eb1b
Merge git://git.infradead.org/~dwmw2/mtd-2.6.26

* git://git.infradead.org/~dwmw2/mtd-2.6.26:
  [MTD] [MAPS] Fix cmdlineparse handling in mapping files
  [MTD] [NAND] pxa: fix incorrect calling of pxa3xx_nand_config() on resume path