From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Sep 2010 00:05:39 +0000 (-0700)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: v2.6.36-rc5~34
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=65e0b598bdb3fe1122ab9a9708fc785e7ac41671;p=~emulex%2Finfiniband.git

Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  mtd: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined
  mtd: mxc_nand: configure pages per block for v2 controller
  mtd: OneNAND: Fix loop hang when DMA error at Samsung SoCs
  mtd: OneNAND: Fix 2KiB pagesize handling at Samsung SoCs
  mtd: Blackfin NFC: fix invalid free in remove()
  mtd: Blackfin NFC: fix build error after nand_scan_ident() change
  mxc_nand: Do not do byte accesses to the NFC buffer.
---

65e0b598bdb3fe1122ab9a9708fc785e7ac41671