Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Feb 2013 22:27:00 +0000 (14:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Feb 2013 22:27:00 +0000 (14:27 -0800)
commite177bb587ea0fade3d9a86f6667da8d89bea3607
treedaebf1786d014cc3182137c76e02381d0aceb245
parent55529fa5762462beb39f913c5277cb96c7be0858
parent561839598e61f03c9175183ea066b2b7fa58ce85
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