Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Sep 2013 19:37:52 +0000 (15:37 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Sep 2013 19:37:52 +0000 (15:37 -0400)
commitf1da3458e9d915d72b0dd30a7c41c3aff8f03589
tree06221f0a766f6de14e9c1eaf48e4d80fbfcc12c4
parent098e7f1665f1a3503524bdd537499e45ad30e67d
parent8930fa500f55215f0211db9b78255e727ac3f282
Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi

Pull UBI fixes from Artem Bityutskiy:
 "Just a single fastmap fix plus a regression fix"

* tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi:
  UBI: Fix invalidate_fastmap()
  UBI: Fix PEB leak in wear_leveling_worker()