From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 12 Mar 2016 00:34:18 +0000 (-0800)
Subject: Merge tag 'for-linus-20160311' of git://git.infradead.org/linux-mtd
X-Git-Tag: v4.5~5
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=03c668a93187fe7fba9464f96fbe7c22eebd9897;p=linux-2.6-block.git

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

Pull MTD fixes from Brian Norris:
 "Late MTD fix for v4.5:

   - A simple error code handling fix for the NAND ECC test; this was a
     regression in v4.5-rc1

   - A MAINTAINERS update, which might as well go in ASAP"

* tag 'for-linus-20160311' of git://git.infradead.org/linux-mtd:
  MAINTAINERS: add a maintainer for the NAND subsystem
  mtd: nand: tests: fix regression introduced in mtd_nandectest
---

03c668a93187fe7fba9464f96fbe7c22eebd9897