tree d77a05b369b40bd48ce663f5206f3630fc942bbc
parent b749e3f8d7879c9c87e237d75b2256b4d1d04df2
parent e93f1be503efd0e44e46fc1fd4c13dbee72a6561
author Linus Torvalds <torvalds@linux-foundation.org> 1228840116 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228840116 -0800

Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  [MTD] [NAND] fix OOPS accessing flash operations over STM flash on PXA
  [MTD] [NAND] drivers/mtd/nand/pasemi_nand.c: Add missing pci_dev_put
  [MTD] [NAND] fsl_upm: fix build problem with 2.6.28-rc2
  [MTD] physmap: fix memory leak on physmap_flash_remove by using devres
  [MTD] m25p80: chip erase != block erase != sector erase
  [MTD] m25p80: fix detection of m25p16 flashes
  [MTD] m25p80: fix detection of SPI parts
  [MTD] [NAND] OMAP: OneNAND: header file relocation (part 2)
  [MTD] [NAND] OMAP: OneNAND: header file relocation