Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Jun 2014 14:38:07 +0000 (07:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Jun 2014 14:38:07 +0000 (07:38 -0700)
commit9df0fe64ebbdd85dd871cb8d52c16efe5ec45319
tree46892269cd241e9e914afa656836721daf4d67e1
parent00170fdd0846df7cdb5ad421d3a340440f930b8f
parent7fd44dacdd803c0bbf38bf478d51d280902bb0f1
Merge branch 'x86-x32-for-linus' of git://git./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}