| commit | 389623fef0e8b088f293c437d3b7094fe82349fd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 07 10:42:31 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 07 10:42:31 2009 -0700 |
| tree | e7e7175531f9ee9a7b215fe6b8c62674fb32862a | |
| parent | 385861206c21364c01dcfdda5064643ce111d517 [diff] | |
| parent | 57ca7deb062abf56168d15f000c16e25f88a9cf3 [diff] |
Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: jffs2: Fix return value from jffs2_do_readpage_nolock() mtd: mtdblock: introduce mtdblks_lock mtd: remove 'SBC8240 Wind River' Device Driver Code mtd: OneNAND: OMAP2/3: free GPMC CS on module removal mtd: OneNAND: fix incorrect bufferram offset mtd: blkdevs: do not forget to get MTD devices mtd: fix the conversion from dev to mtd_info mtd: let include/linux/mtd/partitions.h stand on its own