diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-20 10:38:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-20 10:38:08 -0700 |
| commit | edaf6c38344b026aec8be852bf7ddd9916eedf9e (patch) | |
| tree | f558196ccd4e5331f2fd71e9d4beb999730cbb8a /arch/x86/kernel/cpu/mcheck | |
| parent | c6f5c93098f5577210f8f3ea22209b3f266c66af (diff) | |
| parent | 938ed25008d665d1dd937ca251d1aabb363113c6 (diff) | |
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
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck')
0 files changed, 0 insertions, 0 deletions