tree d77116255f52e5b7b9484b4df41c55126cf06882
parent 4a0d3f3afddf01dfcfdcc826f0b706dbc01f4ef4
parent f7f0283776b6fe33f87f6a2ef15b1feb49ef6dac
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1204768822 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1204768822 -0800

Merge branch 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6

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