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)
commita8d0b6666ecfe14226f1e46d693d5e2cde072337
treefc561f1e0d1489961782fb3c37466ce9c7f1951e
parentc799d15333ff52a3f19ca926636a7774a16cca58
parentebddd63b74dcf1cb676d14328d5852f1fee19a8a
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

* '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