]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7adfff5 d1b9432)
Merge git://git.kvack.org/~bcrl/aio-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Dec 2013 16:32:59 +0000 (08:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Dec 2013 16:32:59 +0000 (08:32 -0800)
commitc537aba00e3f1df8ce6c7c9fcb98b82c0c2d1d2c
tree487b3ceb33b2903fa03ead519a8459d994f77dc4tree | snapshot
parent7adfff587bc4d9ed8f85a31b12464513fda886a2commit | diff
parentd1b9432712a25eeb06114fb4b587133525a47de5commit | diff
Merge git://git.kvack.org/~bcrl/aio-next

Pull aio fix from Benjamin LaHaise:
 "AIO fix from Gu Zheng that fixes a GPF that Dave Jones uncovered with
  trinity"

* git://git.kvack.org/~bcrl/aio-next:
  aio: clean up aio ring in the fail path
fs/aio.c diff1 | diff2 | blob | history
Michael's Linux tree.