]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7fa20a 58a4e23)
Merge tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubifs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 06:28:45 +0000 (15:28 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 06:28:45 +0000 (15:28 +0900)
Pull ubifs changes from Artem Bityutskiy:
 "Mostly fixes for the power cut emulation UBIFS mode, and only one
  functional change which fixes a return error code"

* tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubifs:
  UBIFS: correct data corruption range
  UBIFS: fix return code
  UBIFS: remove unnecessary code in ubifs_garbage_collect

1  2 
fs/ubifs/super.c patch | diff1 | diff2 | blob | history

diff --cc fs/ubifs/super.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.