commit | 78f220a84f464ff1a74d1b646e9b96bdddc47050 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 07 14:02:09 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 07 14:02:09 2010 -0700 |
tree | 9a7b8bd85752f029d84aaef5ff8d189022ea80ff | |
parent | 4848d7156943085c0d4ca0b0575474af25673699 [diff] | |
parent | d3f6e6c666c0f68991d785177c4c62fcd1d651f2 [diff] |
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