| commit | e8444a3e3b56b268c6ca31a2f77040fd944834fb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 13 15:56:22 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 13 15:56:22 2011 -0700 |
| tree | e35fea64da327096ae7fa60a76eed22da2b2f500 | |
| parent | 95a17a23a2189512bc76e7a5901521129d7ae9c1 [diff] | |
| parent | c804c733846572ca85c2bba60c7fe6fa024dff18 [diff] |
Merge git://git.infradead.org/users/dwmw2/mtd-2.6.38 * git://git.infradead.org/users/dwmw2/mtd-2.6.38: mtd: add "platform:" prefix for platform modalias mtd: mtd_blkdevs: fix double free on error path mtd: amd76xrom: fix oops at boot when resources are not available mtd: fix race in cfi_cmdset_0001 driver mtd: jedec_probe: initialise make sector erase command variable mtd: jedec_probe: Change variable name from cfi_p to cfi