tree 3b3a9e873621e7729cc64f36465ffa3cf116c11c
parent 7d6e1cb7aed231b58acd71bdbe67fc03221373e4
parent 450aed725c9a53282483c48ebd012feefae94a07
author Linus Torvalds <torvalds@linux-foundation.org> 1333472833 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1333472833 -0700

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

Pull m68k fixes from Geert Uytterhoeven:
 "Here are a few fixes for the m68k architecture.  Nothing fancy this
  time, just a build fix for the asm/system.h disintegration, and two
  fixes for missing platform checks (one got in during last merge
  window), which can cause crashes in multi-platform kernels."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/q40: Add missing platform check before registering platform devices
  m68k/mac: Add missing platform check before registering platform devices
  m68k: include asm/cmpxchg.h in our m68k atomic.h