]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b5f3451 523a540)
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)
commit4a26ca85642dd8feee887ab06f1b897956d8b803
tree8f47e5caa973d648cf6a2aaa46b68c5fed2491dftree | snapshot
parentb5f34518449ad1d2927cc7d413bf1c79c274151dcommit | diff
parent523a54094c117913ba37bab15547ae2f4b8ae967commit | 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
Linux Kernel Source Tree.