Merge ../aio-fixes
authorBenjamin LaHaise <bcrl@kvack.org>
Mon, 14 Jul 2014 17:14:27 +0000 (13:14 -0400)
committerBenjamin LaHaise <bcrl@kvack.org>
Mon, 14 Jul 2014 17:14:27 +0000 (13:14 -0400)
commit6e830d53717cf3d5c30c1afce3773ef97e436cd9
tree9376a0424b8f9fff12d107aa2498e775da20e85d
parent855ef0dec7271ff7be7381feaaf3f4aed80bd503
parent263782c1c95bbddbb022dc092fd89a36bb8d5577
Merge ../aio-fixes
fs/aio.c