From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Oct 2012 22:31:03 +0000 (+1100)
Subject: Merge remote-tracking branch 'ia64/next'
X-Git-Tag: next-20121011~71
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9455408d0530b0538f99cd9010965a329d081852;p=karo-tx-linux.git

Merge remote-tracking branch 'ia64/next'
---

9455408d0530b0538f99cd9010965a329d081852
diff --cc arch/ia64/include/asm/Kbuild
index 562f59315847,3c3996142438..4a159da23633
--- 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