diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 22:36:57 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 22:36:57 +0100 |
commit | 7d22286ff757586f3cdbd70ded88b98250285ec5 (patch) | |
tree | cf49b699584653535e460d5250ffe8d47712ec14 /drivers/gpio/gpio-omap.c | |
parent | Merge branch 'i2c/for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | aio: Skip timer for io_getevents if timeout=0 (diff) | |
download | linux-7d22286ff757586f3cdbd70ded88b98250285ec5.tar.xz linux-7d22286ff757586f3cdbd70ded88b98250285ec5.zip |
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 'drivers/gpio/gpio-omap.c')
0 files changed, 0 insertions, 0 deletions