From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Mar 2012 16:25:31 +0000 (-0700)
Subject: Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubi
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7e61b3ff50f59f134054aaf43096c761fafecf0c;p=~shefty%2Frdma-dev.git

Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubi

Pull UBI changes from Artem Bityutskiy:
 - Reduce memory consumption
 - Fix picking unknown blocks
 - Fix error-path in 'ubi_scan()'
 - Minor clean-ups

* tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubi:
  UBI: rename MOVE_CANCEL_BITFLIPS to MOVE_TARGET_BITFLIPS
  UBI: rename peb_buf1 to peb_buf
  UBI: reduce memory consumption
  UBI: fix eraseblock picking criteria
  UBI: fix documentation and improve readability
  UBI: fix error handling in ubi_scan()
---

7e61b3ff50f59f134054aaf43096c761fafecf0c