tree 3c4bed740dae7b6115b89387d766962d6dad7cd6
parent 36be50515fe2aef61533b516fa2576a2c7fe7664
parent b027274d2e3a332683b73f15e5cea79c240bc9a3
author Linus Torvalds <torvalds@linux-foundation.org> 1336933989 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1336933989 -0700
mergetag object b027274d2e3a332683b73f15e5cea79c240bc9a3
 type commit
 tag for-linus-3.4-20120513
 tagger David Woodhouse <David.Woodhouse@intel.com> 1336900008 -0700
 
 Three fixes for 3.4:
 
  - 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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iEYEABECAAYFAk+vekgACgkQdwG7hYl686N8bQCfdizsFrliKbDW20R/pO66NoAV
 aloAn0ln+mwe3rIdNt8qKynW8e8dbudF
 =R7XS
 -----END PGP SIGNATURE-----

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