From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 17 Oct 2012 23:30:44 +0000 (+1100)
Subject: Merge remote-tracking branch 'm68knommu/for-next'
X-Git-Tag: next-20121018~73
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f7a3103abc413fa10c125ace39aaabe47d6e73ba;p=karo-tx-linux.git

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

Conflicts:
	arch/m68k/include/asm/termios.h
	arch/m68k/include/uapi/asm/auxvec.h
	arch/m68k/include/uapi/asm/msgbuf.h
	arch/m68k/include/uapi/asm/sembuf.h
	arch/m68k/include/uapi/asm/shmbuf.h
	arch/m68k/include/uapi/asm/socket.h
	arch/m68k/include/uapi/asm/sockios.h
	arch/m68k/include/uapi/asm/termbits.h
---

f7a3103abc413fa10c125ace39aaabe47d6e73ba
diff --cc arch/m68k/include/asm/Kbuild
index 88fa3ac86fae,9c4a654b078a..fe821a2da297
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@@ -1,4 -1,7 +1,5 @@@
 -include include/asm-generic/Kbuild.asm
 -header-y += cachectl.h
  
+ generic-y += auxvec.h
  generic-y += bitsperlong.h
  generic-y += clkdev.h
  generic-y += cputime.h
diff --cc arch/m68k/include/uapi/asm/Kbuild
index 972bce120e1e,baebb3da1d44..aebdbf5a4db4
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@@ -1,26 -1,3 +1,18 @@@
  # UAPI Header export list
  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