projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9689519 5f785de)
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)
commit7d22286ff757586f3cdbd70ded88b98250285ec5
treecf49b699584653535e460d5250ffe8d47712ec14tree | snapshot
parent96895199c8648db475b38aac5fe6a04ec14a49c4commit | diff
parent5f785de588735306ec4d7c875caf9d28481c8b21commit | diff
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 diff1 | diff2 | blob | history
mm/mremap.c diff1 | diff2 | blob | history
John Crispins staging tree