Merge branch 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 6 Mar 2008 02:00:22 +0000 (18:00 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 6 Mar 2008 02:00:22 +0000 (18:00 -0800)
* 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6:
  UBI: mtd/ubi/vtbl.c: fix memory leak
  UBI: fix sparse errors in ubi.h
  UBI: fix error message
  UBI: silence warning


Trivial merge