| commit | 7d22286ff757586f3cdbd70ded88b98250285ec5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Dec 14 13:36:57 2014 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Dec 14 13:36:57 2014 -0800 |
| tree | cf49b699584653535e460d5250ffe8d47712ec14 | |
| parent | 96895199c8648db475b38aac5fe6a04ec14a49c4 [diff] | |
| parent | 5f785de588735306ec4d7c875caf9d28481c8b21 [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