From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 2 Nov 2012 00:02:49 +0000 (+1100)
Subject: Merge remote-tracking branch 'm68knommu/for-next'
X-Git-Tag: next-20121102~104
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=680aebd1af3ee03fffedf48c04cf7711848431b4;p=karo-tx-linux.git

Merge remote-tracking branch 'm68knommu/for-next'
---

680aebd1af3ee03fffedf48c04cf7711848431b4
diff --cc arch/m68k/include/uapi/asm/Kbuild
index 972bce120e1e,972bce120e1e..aebdbf5a4db4
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@@ -2,25 -2,25 +2,17 @@@
  include include/uapi/asm-generic/Kbuild.asm
  
  header-y += a.out.h
--header-y += auxvec.h
  header-y += byteorder.h
  header-y += cachectl.h
  header-y += fcntl.h
  header-y += ioctls.h
--header-y += msgbuf.h
  header-y += param.h
  header-y += poll.h
  header-y += posix_types.h
  header-y += ptrace.h
--header-y += sembuf.h
  header-y += setup.h
--header-y += shmbuf.h
  header-y += sigcontext.h
  header-y += signal.h
--header-y += socket.h
--header-y += sockios.h
  header-y += stat.h
  header-y += swab.h
--header-y += termbits.h
--header-y += termios.h
  header-y += unistd.h