From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Oct 2012 01:03:21 +0000 (+0300)
Subject: Merge tag 'please-pull-uapi-fix' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~13763
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=62472efed98ef086aaa86e735ae50ac9473d7891;p=mirror_ubuntu-artful-kernel.git

Merge tag 'please-pull-uapi-fix' of git://git.kernel.org/pub/scm/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
---

62472efed98ef086aaa86e735ae50ac9473d7891