Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 19:34:17 +0000 (11:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 19:34:17 +0000 (11:34 -0800)
* 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6:
  UBI: Don't exit from ubi_thread until kthread_should_stop() is true
  UBI: fix EBADMSG handling


Trivial merge