From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Oct 2013 19:15:13 +0000 (+0100)
Subject: Merge tag 'for-linus-20131025' of git://git.infradead.org/linux-mtd
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d255c59aab2a3fdf0bb8a5db75e50d9c926c3bb9;p=openwrt%2Fstaging%2Fblogic.git

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

Pull final mtd fixes from Brian Norris:
 "A few more last-minute regression fixes, prepared jointly by me and
  David Woodhouse:

   - Revert pxa3xx to its old name to avoid breaking existing
     'mtdparts=' boot strings.

   - Return GPMI NAND to its legacy ECC layout for backwards
     compatibility.  We will revisit this in 3.13.

  A note from David on the latter fix: 'This leaves a harmless cosmetic
  warning about an unused function.  At this point in the cycle I really
  don't care.'"

* tag 'for-linus-20131025' of git://git.infradead.org/linux-mtd:
  mtd: gpmi: fix ECC regression
  mtd: nand: pxa3xx: Fix registered MTD name
---

d255c59aab2a3fdf0bb8a5db75e50d9c926c3bb9