diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 20:19:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 20:19:19 -0700 |
| commit | 82b666eee71618b7ca812ee529af116582617dec (patch) | |
| tree | 843b000e0a0c4d5908645154091fadff4c0bde6e /mm/hwpoison-inject.c | |
| parent | 588ab3f9afdfa1a6b1e5761c858b2c4ab6098285 (diff) | |
| parent | a3595962d82495f51a80feb19dcdb135556a9527 (diff) | |
| download | linux-82b666eee71618b7ca812ee529af116582617dec.tar.bz2 | |
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 'mm/hwpoison-inject.c')
0 files changed, 0 insertions, 0 deletions