From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Oct 2012 01:38:34 +0000 (+0900)
Subject: Merge tag 'please-pull-dhowells-uapi' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.7-rc1~28
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=0c4a479bdf7c0cf3fa1610b25e0c4ddd5b58713e;p=~andy%2Flinux

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

0c4a479bdf7c0cf3fa1610b25e0c4ddd5b58713e
diff --cc arch/ia64/include/asm/Kbuild
index 562f5931584,3c399614243..4a159da2363
--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@@ -1,17 -1,2 +1,3 @@@
- include include/asm-generic/Kbuild.asm
  
- header-y += break.h
- header-y += cmpxchg.h
- header-y += fpu.h
- header-y += gcc_intrin.h
- header-y += ia64regs.h
- header-y += intel_intrin.h
- header-y += intrinsics.h
- header-y += perfmon.h
- header-y += perfmon_default_smpl.h
- header-y += ptrace_offsets.h
- header-y += rse.h
- header-y += ucontext.h
- header-y += ustack.h
  generic-y += clkdev.h
 +generic-y += exec.h