Skip to main content

Browse the archive

Revision edaf6c38344b026aec8be852bf7ddd9916eedf9e authored by Linus Torvalds on 20 April 2012, 17:38:08 UTC, committed by Linus Torvalds on 20 April 2012, 17:38:08 UTC 
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
2 parent s c6f5c93 + 938ed25
History
File Mode Size
Makefile -rw-r--r-- 140 bytes
inode.c -rw-r--r-- 15.2 KB
back to top