summaryrefslogtreecommitdiff
path: root/arch/sparc/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-17 20:19:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-17 20:19:19 -0700
commit82b666eee71618b7ca812ee529af116582617dec (patch)
tree843b000e0a0c4d5908645154091fadff4c0bde6e /arch/sparc/include
parent588ab3f9afdfa1a6b1e5761c858b2c4ab6098285 (diff)
parenta3595962d82495f51a80feb19dcdb135556a9527 (diff)
downloadlinux-82b666eee71618b7ca812ee529af116582617dec.tar.gz
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer: "The main change is the removal of the bit-rotten 68360 support. Also a fix to always make the ethernet FEC platform info available" * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: remove obsolete 68360 support m68knommu: fix FEC platform device registration when driver is modular
Diffstat (limited to 'arch/sparc/include')
0 files changed, 0 insertions, 0 deletions