]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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)
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

1  2 
arch/ia64/include/asm/Kbuild

index 562f59315847cae6de4782e3f1bed6cc0e1883eb,3c399614243869b02c9be8d84cd5d7a0cc0e1e0e..4a159da23633dbf359c9886513958ce49e842ce7
@@@ -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