From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Jul 2015 18:19:38 +0000 (-0700)
Subject: Merge tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd
X-Git-Tag: v4.2-rc4~10
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=32fd3d4ac93261616564fbb544738b260f89bc7e;p=linux.git

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

Pull MTD fixes from Brian Norris:
 "Two trivial updates.  I meant to send these much earlier, but I've
  been preoccupied.

   - Add MAINTAINERS entry for diskonchip g3 driver

   - Fix an overlooked conflict in bitfield value assignments

  The latter update is a bit overdue, but there's no reason to wait any
  longer"

* tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd:
  mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
  MAINTAINERS: mtd: docg3: add docg3 maintainer
---

32fd3d4ac93261616564fbb544738b260f89bc7e