From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Mar 2013 15:27:41 +0000 (-0700)
Subject: Merge tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd
X-Git-Tag: v3.9-rc4~31
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=35f8c769aa5f3d9a81d50e9bdcbfd4151e72a0c9;p=~andy%2Flinux

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

Pull MTD fixes from David Woodhouse:
 "This fixes a couple of problems.  Firstly, some people are actually
  still using old small-page flash and we broke it by removing the ready
  check.

  Secondly.  fix the handling of partitions on Broadcom 47xx devices.
  Recent changes had made it misdetect the location of the NVRAM and
  scribble over the bootloader when it tried to update the variables
  there.  With predictably sad results."

* tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd:
  mtd: nand: reintroduce NAND_NO_READRDY as NAND_NEED_READRDY
  mtd: bcm47xxpart: look for NVRAM at the end of device
  Revert "mtd: bcm47xxpart: improve probing of nvram partition"
---

35f8c769aa5f3d9a81d50e9bdcbfd4151e72a0c9