| commit | 2025fef0ca0c8c7fa730a3e0399243721a4925f1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 09 09:15:46 2018 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 09 09:15:46 2018 -0700 |
| tree | 8f47e5caa973d648cf6a2aaa46b68c5fed2491df | |
| parent | 5148408a5165e2f69203fcf4481a8153837ef260 [diff] | |
| parent | f61e64310b75733d782e930d1fb404b84699eed6 [diff] |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu Pull m68knommu update from Greg Ungerer: "Only a single fix to set the DMA masks in the ColdFire FEC platform data structure. This stops the warning from dma-mapping.h at boot time" * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: set dma and coherent masks for platform FEC ethernets