]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge tag 'please-pull-uapi-fix' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Oct 2012 01:03:21 +0000 (04:03 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Oct 2012 01:03:21 +0000 (04:03 +0300)
Pull ia64 fix from Tony Luck:
 "Fix from dhowells for UAPI fallout"

* tag 'please-pull-uapi-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  UAPI: Make arch/ia64/include/asm/kvm_para.h generic


Trivial merge