From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Dec 2012 21:23:33 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/can-eth-gw-linux.git/commitdiff_plain/3127f23f013eabe9b58132c05061684c49146ba3

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven.

Fix up trivial conflict (m68k switched to generic version of
uapi/asm/socket.h, net tree updated the old one) as per Geert.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/sun3: Fix instruction faults
  m68k/sun3: Get interrupts working again
  m68k: move to a single instance of free_initmem()
  m68k: merge MMU and non-MMU versions of mm/init.c
  m68k: switch to using the asm-generic termios.h
  m68k: switch to using the asm-generic termbits.h
  m68k: switch to using the asm-generic sockios.h
  m68k: switch to using the asm-generic socket.h
  m68k: switch to using the asm-generic shmbuf.h
  m68k: switch to using the asm-generic sembuf.h
  m68k: switch to using the asm-generic msgbuf.h
  m68k: switch to using the asm-generic auxvec.h
  m68k: switch to using the asm-generic shmparam.h
  m68k: switch to using the asm-generic spinlock.h
  m68k: switch to using the asm-generic hw_irq.h
  arch/m68k: remove CONFIG_EXPERIMENTAL
---

3127f23f013eabe9b58132c05061684c49146ba3
diff --cc arch/m68k/include/asm/Kbuild
index 7f1949c0e089,d62e01f869f5..c7933e41f10d
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@@ -21,10 -22,12 +22,13 @@@ generic-y += percpu.
  generic-y += resource.h
  generic-y += scatterlist.h
  generic-y += sections.h
+ generic-y += shmparam.h
  generic-y += siginfo.h
+ generic-y += spinlock.h
  generic-y += statfs.h
+ generic-y += termios.h
  generic-y += topology.h
 +generic-y += trace_clock.h
  generic-y += types.h
  generic-y += word-at-a-time.h
  generic-y += xor.h