| commit | 9df0fe64ebbdd85dd871cb8d52c16efe5ec45319 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 05 07:38:07 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 05 07:38:07 2014 -0700 |
| tree | 46892269cd241e9e914afa656836721daf4d67e1 | |
| parent | 00170fdd0846df7cdb5ad421d3a340440f930b8f [diff] | |
| parent | 7fd44dacdd803c0bbf38bf478d51d280902bb0f1 [diff] |
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull x86 x32 ABI fix from Peter Anvin:
"A single fix for the x32 ABI: the io_setup() and io_submit() system
call need to use the compat stubs"
* 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, x32: Use compat shims for io_{setup,submit}