commit 060e8e3b6f8fc0ba97de2276249fbd80fa25b0a2
author Linus Torvalds <torvalds@linux-foundation.org> Thu Jan 30 20:04:09 2014 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Jan 30 20:04:09 2014 -0800
tree f36d3ccd0fa20f98c694c09ab9b07ec3db0a00f6
parent 271bf66d4c0c8db29764d241e4e46883d9c0a198
parent 2c7ca5cc3624e05a5235f70039adce30725972d6

Merge tag 'upstream-3.14-rc1' of git://git.infradead.org/linux-ubifs

Pull ubifs updates from Artem Bityutskiy:

 - Improve the NOR erasure quirk - now it tries to do as little writes
   as possible, because the eraseblock may be in an "unstable" state and
   write operation sometimes causes NOR chip lock-ups.

 - Both UBI and UBIFS changes are now maintainer in one single tree,
   because the amount of changes dropped significantly.

* tag 'upstream-3.14-rc1' of git://git.infradead.org/linux-ubifs:
  UBI: avoid program operation on NOR flash after erasure interrupted
  MAINTAINERS: keep UBI and UBIFS stuff in the same tree
  UBI: fix error return code