Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Aug 2009 21:58:34 +0000 (14:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Aug 2009 21:58:34 +0000 (14:58 -0700)
commitf4b9a988685da6386d7f9a72df3098bcc3270526
tree73432363e9f42b3d0d79d523c91058bb53555722
parent17d11ba14990d2bbaaec9c09a200b803679a968e
parent32bc4820287a1a03982979515949e8ea56eac641
Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

* 'for-linus' of git://git.infradead.org/ubi-2.6:
  UBI: compatible fallback in absense of sequence numbers
  UBI: fix double free on error path