From: Linus Torvalds Date: Fri, 6 Dec 2013 16:32:59 +0000 (-0800) Subject: Merge git://git.kvack.org/~bcrl/aio-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c537aba00e3f1df8ce6c7c9fcb98b82c0c2d1d2c;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 --- c537aba00e3f1df8ce6c7c9fcb98b82c0c2d1d2c