summary refs log tree commit diff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-13 11:33:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-13 11:33:09 -0700
commit9ff00d58a915b6747ba2e843ab2d04c712b4dc32 (patch)
tree3c4bed740dae7b6115b89387d766962d6dad7cd6 /init
parent36be50515fe2aef61533b516fa2576a2c7fe7664 (diff)
parentb027274d2e3a332683b73f15e5cea79c240bc9a3 (diff)
downloadlinux-9ff00d58a915b6747ba2e843ab2d04c712b4dc32.tar.gz
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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions