diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 15:28:45 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 15:28:45 +0900 |
commit | fbe43ff0031ded2b8500382da17d5d815a9c3edd (patch) | |
tree | bb10258396c467b83be10d1a3ee41ab33213cb1a /fs/aio.c | |
parent | a7fa20a594fadf1e37cb3469c880ce6a544d3c3b (diff) | |
parent | 58a4e23703b22c331b01fbd0c12161aadaa6d50b (diff) |
Merge tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubifs
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
Diffstat (limited to 'fs/aio.c')
0 files changed, 0 insertions, 0 deletions