diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-12 18:20:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-12 18:20:15 +0100 |
| commit | 4388817f702c68bf4857dae87b6cf4969c1791bc (patch) | |
| tree | 519d15f4e28138a8e54738a27edd0d0682c980be /arch/.gitignore | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| parent | m68k: drop "select EMAC_INC" (diff) | |
| download | linux-4388817f702c68bf4857dae87b6cf4969c1791bc.tar.xz linux-4388817f702c68bf4857dae87b6cf4969c1791bc.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fixes from Greg Ungerer:
"It contains a few small fixes for the non-MMU m68k platforms. Fixes
some compilation problems, some broken header definitions, removes an
unused config option and adds a name for the old 68000 CPU support."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: drop "select EMAC_INC"
m68knommu: fix misnamed GPIO pin definition for ColdFire 528x CPU
m68knommu: fix MC68328.h defines
m68knommu: fix build when CPU is not coldfire
m68knommu: add CPU_NAME for 68000
Diffstat (limited to 'arch/.gitignore')
0 files changed, 0 insertions, 0 deletions