projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5148408 f61e643)
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Apr 2018 16:15:46 +0000 (09:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Apr 2018 16:15:46 +0000 (09:15 -0700)
commit2025fef0ca0c8c7fa730a3e0399243721a4925f1
tree8f47e5caa973d648cf6a2aaa46b68c5fed2491dftree | snapshot
parent5148408a5165e2f69203fcf4481a8153837ef260commit | diff
parentf61e64310b75733d782e930d1fb404b84699eed6commit | diff
Merge branch 'for-next' of git://git./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
John Crispins staging tree