From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Aug 2012 17:08:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v3.6-rc3~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6b881a5b8d4fa2135e55a74be6d6b1e17e445dd;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'for-linus' of git://git./linux/kernel/git/gerg/m68knommu

Pull m68knommu arch fixes from Greg Ungerer:
 "This contains 2 fixes.  One fixes compilation of ColdFire clk code,
  the other makes sure we use the generic atomic64 support on all m68k
  targets."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: select CONFIG_GENERIC_ATOMIC64 for all m68k CPU types
  m68knommu: select CONFIG_HAVE_CLK for ColdFire CPU types
---

a6b881a5b8d4fa2135e55a74be6d6b1e17e445dd