Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Jul 2009 16:26:13 +0000 (09:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Jul 2009 16:26:13 +0000 (09:26 -0700)
commit61fe087059614226978f4d7bb36da26cb2d28f9f
tree95558d4dfa3409bfedcac17f7a899082b37ad334
parent71c4c8b7c3bdeccef4f478c643a9ff382ec07241
parent3dc948da783e713cd3dc8bbd8f293f8795af8f06
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: fix bug in image sequence number handling
  UBI: gluebi: initialize ubi_num field