From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Mar 2016 01:36:46 +0000 (-0800)
Subject: Merge tag 'for-linus-20160304' of git://git.infradead.org/linux-mtd
X-Git-Tag: v4.5~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c51797d25d84833804e9e6950c8c1abbe6c73808;p=platform%2Fkernel%2Flinux-amlogic.git

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

Pull jffs2 fixes from David Woodhouse:
 "This contains two important JFFS2 fixes marked for stable:

   - a lock ordering problem between the page lock and the internal
     f->sem mutex, which was causing occasional deadlocks in garbage
     collection

   - a scan failure causing moved directories to sometimes end up
     appearing to have hard links.

  There are also a couple of trivial MAINTAINERS file updates"

* tag 'for-linus-20160304' of git://git.infradead.org/linux-mtd:
  MAINTAINERS: add maintainer entry for FREESCALE GPMI NAND driver
  Fix directory hardlinks from deleted directories
  jffs2: Fix page lock / f->sem deadlock
  Revert "jffs2: Fix lock acquisition order bug in jffs2_write_begin"
  MAINTAINERS: update Han's email
---

c51797d25d84833804e9e6950c8c1abbe6c73808