Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 21:02:09 +0000 (14:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 21:02:09 +0000 (14:02 -0700)
commit78f220a84f464ff1a74d1b646e9b96bdddc47050
tree9a7b8bd85752f029d84aaef5ff8d189022ea80ff
parent4848d7156943085c0d4ca0b0575474af25673699
parentd3f6e6c666c0f68991d785177c4c62fcd1d651f2
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