Merge git://git.infradead.org/~dwmw2/mtd-2.6.26

Browse source

* 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

...

This commit is contained in:

Linus Torvalds 2008-06-05 14:25:48 -07:00

parent adbd5886da ba75321193

commit 698f7a4a12

3 changed files with 3 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/mtd/maps/omap_nor.c

View file

2

drivers/mtd/nand/pxa3xx_nand.c

View file

2

drivers/mtd/onenand/generic.c

View file