Merge git://git.infradead.org/mtd-2.6
commit621c2559c16fc703e24fc0e3ffad28d5477b49c7
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 May 2009 00:00:41 +0000 (8 17:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 May 2009 00:00:41 +0000 (8 17:00 -0700)
treecc46b4501f53423e81572d1c47174a5fd0afa1bf
parentd9d05fda919cb6414ae4889b696b2fada7a23217
parentcd1a6de7d4a492bf3405a6c070075a4cb8c90262
Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  mtd: fix timeout in M25P80 driver
  mtd: Bug in m25p80.c during whole-chip erase
  mtd: expose subpage size via sysfs
  mtd: mtd in mtd_release is unused without CONFIG_MTD_CHAR