From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Feb 2013 22:27:00 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: MMI-PSA29.97-13-9~15018
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e177bb587ea0fade3d9a86f6667da8d89bea3607;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Pull m68k update from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA
  swim: Add missing spinlock init
---

e177bb587ea0fade3d9a86f6667da8d89bea3607