]> 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)
commit868271c97444f97cc7e952ca6d03f778eee7bd62
treecf49b699584653535e460d5250ffe8d47712ec14
parent483b452b07012f6d2393f33b85b3242491aae1e7
parentae964b088ce233999340c2b6fc067c427513c449
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