]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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)
* 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


Trivial merge