tree fc561f1e0d1489961782fb3c37466ce9c7f1951e
parent c799d15333ff52a3f19ca926636a7774a16cca58
parent ebddd63b74dcf1cb676d14328d5852f1fee19a8a
author Linus Torvalds <torvalds@linux-foundation.org> 1264474926 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1264474926 -0800

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