From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Oct 2013 18:30:33 +0000 (-0700)
Subject: Merge tag 'for-linus-20131008' of git://git.infradead.org/linux-mtd
X-Git-Tag: firefly_0821_release~176^2~5175
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b291a22952e74bb2fcf9c57c6d8bae52a4f197e2;p=firefly-linux-kernel-4.4.55.git

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

Pull MTD fixes from Brian Norris:
 - fix a small memory leak in some new ONFI code
 - account for additional odd variations of Micron SPI flash

Acked by David Woodhouse.

* tag 'for-linus-20131008' of git://git.infradead.org/linux-mtd:
  mtd: m25p80: Fix 4 byte addressing mode for Micron devices.
  mtd: nand: fix memory leak in ONFI extended parameter page
---

b291a22952e74bb2fcf9c57c6d8bae52a4f197e2