Merge remote-tracking branch 'ia64/next'

Conflicts:
	arch/ia64/include/asm/Kbuild

diff --cc arch/ia64/include/asm/Kbuild
index 58f3d14a6cd4029b18531bcd1d0224d8337f7d3e,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d756d59034b8e8d2a7c8853ce41834eb2342fdfd
--- 1/arch/ia64/include/asm/Kbuild
--- 2/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@@ -1,16 -1,0 +1,1 @@@
- 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