diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-20 13:12:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-20 13:12:29 -0400 |
| commit | 5ca08a82a75c9109f8207cbcbef8705334b4713a (patch) | |
| tree | 5829fcfb3c79b28f80308d19ea11eb64d6d416e5 /arch/s390 | |
| parent | f4d03bd143c628b00f66cc2ec2c013767bdd1518 (diff) | |
| parent | 6e4206136faa9a4d588946dfa604e1d989a9b3b6 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68k fixes from Greg Ungerer:
"Nothing big, spelling fixes and fix/cleanup for ColdFire eth device setup"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: fix fec setup warning for ColdFire 5271 builds
m68knommu: ColdFire 5271 only has a single FEC controller
m68k: Fix trivial typos in comments
Diffstat (limited to 'arch/s390')
0 files changed, 0 insertions, 0 deletions