From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Feb 2012 15:17:47 +0000 (-0800)
Subject: Merge tag 'for-linus-3.3' of git://git.infradead.org/~dwmw2/mtd-3.3
X-Git-Tag: v3.3-rc3~26
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=71b1b20b8aea6ba4a1a15736409f1261d8dfe1da;p=linux.git

Merge tag 'for-linus-3.3' of git://git.infradead.org/~dwmw2/mtd-3.3

 - Fix a regression in 16-bit Atmel NAND flash which was introduced in 3.1
 - Fix breakage with MTD suspend caused by the API rework
 - Fix a problem with resetting the MX28 BCH module
 - A couple of other trivial fixes

* tag 'for-linus-3.3-20120204' of git://git.infradead.org/~dwmw2/mtd-3.3:
  Revert "mtd: atmel_nand: optimize read/write buffer functions"
  mtd: fix MTD suspend
  jffs2: do not initialize variable unnecessarily
  mtd: gpmi-nand bugfix: reset the BCH module when it is not MX23
  mtd: nand: fix typo in comment
---

71b1b20b8aea6ba4a1a15736409f1261d8dfe1da