summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-15 00:36:57 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-15 00:36:57 +0300
commit7d22286ff757586f3cdbd70ded88b98250285ec5 (patch)
treecf49b699584653535e460d5250ffe8d47712ec14 /usr
parent96895199c8648db475b38aac5fe6a04ec14a49c4 (diff)
parent5f785de588735306ec4d7c875caf9d28481c8b21 (diff)
downloadlinux-7d22286ff757586f3cdbd70ded88b98250285ec5.tar.xz
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
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions