From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 13 May 2012 18:33:09 +0000 (-0700)
Subject: Merge tag 'for-linus-3.4-20120513' of git://git.infradead.org/linux-mtd
X-Git-Tag: MMI-PSA29.97-13-9~16828
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9ff00d58a915b6747ba2e843ab2d04c712b4dc32;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'for-linus-3.4-20120513' of git://git.infradead.org/linux-mtd

Pull three MTD fixes from David Woodhouse:
 - Fix a lock ordering deadlock in JFFS2
 - Fix an oops in the dataflash driver, triggered by a dummy call to test
   whether it has OTP functionality.
 - Fix request_mem_region() failure on amsdelta NAND driver.

* tag 'for-linus-3.4-20120513' of git://git.infradead.org/linux-mtd:
  mtd: ams-delta: fix request_mem_region() failure
  jffs2: Fix lock acquisition order bug in gc path
  mtd: fix oops in dataflash driver
---

9ff00d58a915b6747ba2e843ab2d04c712b4dc32