From: Linus Torvalds Date: Mon, 16 Sep 2013 19:37:52 +0000 (-0400) Subject: Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f1da3458e9d915d72b0dd30a7c41c3aff8f03589;p=linux-beck.git 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() --- f1da3458e9d915d72b0dd30a7c41c3aff8f03589