From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Jun 2009 16:46:33 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
X-Git-Tag: v2.6.31-rc1~287
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7c142dbf1e7422d0be7f7faa3f1163ad9da9788;p=pandora-kernel.git

Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBIFS: start using hrtimers
  hrtimer: export ktime_add_safe
  UBIFS: do not forget to register BDI device
  UBIFS: allow sync option in rootflags
  UBIFS: remove dead code
  UBIFS: use anonymous device
  UBIFS: return proper error code if the compr is not present
  UBIFS: return error if link and unlink race
  UBIFS: reset no_space flag after inode deletion
---

b7c142dbf1e7422d0be7f7faa3f1163ad9da9788