• Linus Torvalds's avatar
    Merge tag 'upstream-3.14-rc1' of git://git.infradead.org/linux-ubifs · 060e8e3b
    Linus Torvalds authored
    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
    060e8e3b
MAINTAINERS 265 KB