From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jun 2012 19:48:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v3.5~126
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ebfbe9a1a92fdde66f0b7b017bf39ad7974fe17;p=platform%2Fkernel%2Flinux-amlogic.git

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

Pull a m68knommu fix from Greg Ungerer:
 "It contains a single fix for breakage using the Freescale FEC eth
  driver on ColdFire CPUs."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: define a local devm_clk_get() function
---

6ebfbe9a1a92fdde66f0b7b017bf39ad7974fe17