Merge tag 'disintegrate-sh-20121009' of git://git.infradead.org/users/dhowells/linux...

UAPI Disintegration 2012-10-09

diff --combined arch/sh/include/asm/Kbuild
index 86eadceff097481b4ba5ce3494d60134f50e02ae,f734b4478fa23d357e61647a39c49b98681f5601..29f83beeef7a4c463d814ee445f73e47e2ff24b8
--- 1/arch/sh/include/asm/Kbuild
--- 2/arch/sh/include/asm/Kbuild
+++ b/arch/sh/include/asm/Kbuild
@@@ -1,4 -1,3 +1,3 @@@
- include include/asm-generic/Kbuild.asm
  
  generic-y += bitsperlong.h
  generic-y += cputime.h
@@@ -7,7 -6,6 +6,7 @@@ generic-y += delay.
  generic-y += div64.h
  generic-y += emergency-restart.h
  generic-y += errno.h
 +generic-y += exec.h
  generic-y += fcntl.h
  generic-y += ioctl.h
  generic-y += ipcbuf.h
@@@ -34,13 -32,3 +33,3 @@@ generic-y += termbits.
  generic-y += termios.h
  generic-y += ucontext.h
  generic-y += xor.h
- 
- header-y += cachectl.h
- header-y += cpu-features.h
- header-y += hw_breakpoint.h
- header-y += posix_types_32.h
- header-y += posix_types_64.h
- header-y += ptrace_32.h
- header-y += ptrace_64.h
- header-y += unistd_32.h
- header-y += unistd_64.h