[GIT PULL] MTD updates for 4.2-rc4

[Brian Norris]

Hi Linus,

The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:

  Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)

are available in the git repository at:

  git://git.infradead.org/linux-mtd.git tags/for-linus-20150724

for you to fetch changes up to 5f867db63473f32cce1b868e281ebd42a41f8fad:

  mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict (2015-07-07 13:03:25 -0700)

----------------------------------------------------------------
MTD updates for 4.2-rc4:

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.

----------------------------------------------------------------
Robert Jarzmik (1):
      MAINTAINERS: mtd: docg3: add docg3 maintainer

Scott Wood (1):
      mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict

 MAINTAINERS              |  6 ++++++
 include/linux/mtd/nand.h | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)