From: Linus Torvalds Date: Sat, 9 May 2009 00:00:41 +0000 (-0700) Subject: Merge git://git.infradead.org/mtd-2.6 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=621c2559c16fc703e24fc0e3ffad28d5477b49c7;p=openwrt%2Fstaging%2Fblogic.git 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 --- 621c2559c16fc703e24fc0e3ffad28d5477b49c7