From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Jun 2008 21:25:48 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/mtd-2.6.26
X-Git-Tag: v2.6.26-rc6~98
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=698f7a4a12c15fef354b2a1ac14f90a0e71008d9;p=linux-2.6-omap-h63xx.git

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
---

698f7a4a12c15fef354b2a1ac14f90a0e71008d9