Merge tag 'upstream-3.9-rc6' of git://git.infradead.org/linux-ubifs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Apr 2013 15:41:43 +0000 (08:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Apr 2013 15:41:43 +0000 (08:41 -0700)
commit22d1e6f4c509eea39fd9232a01697e1cf08ff8a8
tree617d8a3f438dc47e2fe79d244ea4af22281afaf6
parent014642cb0a08d1b12c6089c48c7ba6002a0f6811
parent67e753ca41782913d805ff4a8a2b0f60b26b7915
Merge tag 'upstream-3.9-rc6' of git://git.infradead.org/linux-ubifs

Pull UBIFS fix from Artem Bityutskiy:
 "Make the space fixup feature work in the case when the file-system is
  first mounted R/O and then remounted R/W."

* tag 'upstream-3.9-rc6' of git://git.infradead.org/linux-ubifs:
  UBIFS: make space fixup work in the remount case