Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Jul 2009 02:15:34 +0000 (19:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Jul 2009 02:15:34 +0000 (19:15 -0700)
commitd6be791cbd4d6a96f0ec1c8c44166038c76d1330
tree2a13a10330a8a13540c119c531b052ac6c27e39c
parent44c695b13bee558c73a89bc79f6253a4ba637386
parent83c2099f5e1f0a4621ed4f20fc539069c636a24b
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: fix compilation warnings
  UBI: fix NOR flash recovery
  UBI: nicify image sequence number handling
  UBI: add image sequence number to EC header
  UBI: remove bogus debugging checks
  UBI: add empty eraseblocks verification