| commit | 6ebfbe9a1a92fdde66f0b7b017bf39ad7974fe17 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 27 12:48:39 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 27 12:48:39 2012 -0700 |
| tree | a430ae2725d6f9bcdbd2307571e19913e7224cff | |
| parent | 843760c58e7dc46a9325169ac72d27b3e2def426 [diff] | |
| parent | 19a1d332cc8ca599578111b9ff8cd6963f75c387 [diff] |
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