From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 13 Mar 2011 22:56:22 +0000 (-0700)
Subject: Merge git://git.infradead.org/users/dwmw2/mtd-2.6.38
X-Git-Tag: v2.6.38~16
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e8444a3e3b56b268c6ca31a2f77040fd944834fb;p=linux.git

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
---

e8444a3e3b56b268c6ca31a2f77040fd944834fb