Merge tag 'please-pull-dhowells-uapi' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 01:38:34 +0000 (10:38 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 01:38:34 +0000 (10:38 +0900)
commit0c4a479bdf7c0cf3fa1610b25e0c4ddd5b58713e
tree4d1f97d241b692ad8f7aeca9c5b773fbabfae258
parentade0899b298ba2c43bfd6abd8cbc2545944cde0c
parentd536e0db2433686238ec97c517e4fc691000ee6f
Merge tag 'please-pull-dhowells-uapi' of git://git./linux/kernel/git/aegl/linux

Pull ia64 UAPI changes from Tony Luck:
 "ia64 pieces of David Howells great UAPI include file move"

* tag 'please-pull-dhowells-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  UAPI: (Scripted) Disintegrate arch/ia64/include/asm
arch/ia64/include/asm/Kbuild