Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jan 2010 03:02:06 +0000 (19:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jan 2010 03:02:06 +0000 (19:02 -0800)
* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: fix memory leak in update path
  UBI: add more checks to chdev open
  UBI: initialise update marker


Trivial merge