From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Nov 2013 06:29:38 +0000 (+0900)
Subject: Merge tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubi
X-Git-Tag: v3.13-rc1~109
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=39222c82f738190a4f09be89510a8336a73b67c8;p=~emulex%2Finfiniband.git

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

Pull UBI changes from Artem Bityutskiy:
 "A bunch of fixes for the fastmap feature, which is still new and
  rather experimental.  It looks like it starts getting more users.

  No significant changes for the "classical" non-fastmap UBI"

* tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubi:
  UBI: Add some asserts to ubi_attach_fastmap()
  UBI: Fix memory leak in ubi_attach_fastmap() error path
  UBI: simplify image sequence test
  UBI: fastmap: fix backward compatibility with image_seq
  UBI: Call scan_all() with correct offset in error case
  UBI: Fix error path in scan_pool()
  UBI: fix refill_wl_user_pool()
---

39222c82f738190a4f09be89510a8336a73b67c8