tree a430ae2725d6f9bcdbd2307571e19913e7224cff
parent 843760c58e7dc46a9325169ac72d27b3e2def426
parent 19a1d332cc8ca599578111b9ff8cd6963f75c387
author Linus Torvalds <torvalds@linux-foundation.org> 1340826519 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1340826519 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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