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)
commit62472efed98ef086aaa86e735ae50ac9473d7891
tree7a7498b9afd5a20fe2ad50f1895ca43f73b00c97
parent2d1f4c8e097dc1f5d71fa7f2e250a674adfbbc71
parent7e3cdf242f6dfa8d66dac8e1a5167f3e3101d213
Merge tag 'please-pull-uapi-fix' of git://git./linux/kernel/git/aegl/linux

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