From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Apr 2012 17:38:08 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v3.4~168
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=edaf6c38344b026aec8be852bf7ddd9916eedf9e;p=platform%2Fkernel%2Flinux-amlogic.git

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

Pull m68k arch fixes from Greg Ungerer:
 "This contains four fixes for 3.4.  Two fix and clean up compilation
  for the nommu 68x328 CPU targets.  The other two fix the platform
  definition and multi-function pin setup of the second eth interface
  on the ColdFire 5275 SoC."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: make sure 2nd FEC eth interface pins are enabled on 5275 ColdFire
  m68knommu: fix id number for second eth device on 5275 ColdFire
  m68knommu: move and fix the 68VZ328 platform bootlogo.h
  m68knommu: remove the unused bootlogo.h processing for 68EZ328 and 68VZ328
---

edaf6c38344b026aec8be852bf7ddd9916eedf9e