]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kvack.org/~bcrl/aio-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Dec 2014 21:36:57 +0000 (13:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Dec 2014 21:36:57 +0000 (13:36 -0800)
commit7232394f9829f30631716e9c517f57d18d31d7c8
treecf49b699584653535e460d5250ffe8d47712ec14
parentcade38209bfdd7ecf755c293fea4daed838bb3ee
parent8efa7c91c54166febf34a85dfff0a011fded5129
Merge git://git.kvack.org/~bcrl/aio-next

Pull aio updates from Benjamin LaHaise.

* git://git.kvack.org/~bcrl/aio-next:
  aio: Skip timer for io_getevents if timeout=0
  aio: Make it possible to remap aio ring
include/linux/fs.h
mm/mremap.c