From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Sep 2010 21:02:09 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
X-Git-Tag: firefly_0821_release~9833^2~618
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=78f220a84f464ff1a74d1b646e9b96bdddc47050;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: do not oops when erroneous PEB is scheduled for scrubbing
  UBI: fix kconfig unmet dependency
  UBI: fix forward compatibility
  UBI: eliminate update of list_for_each_entry loop cursor
---

78f220a84f464ff1a74d1b646e9b96bdddc47050