Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Jun 2012 19:48:39 +0000 (12:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Jun 2012 19:48:39 +0000 (12:48 -0700)
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


Trivial merge