Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Sep 2018 02:33:26 +0000 (16:33 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Sep 2018 02:33:26 +0000 (16:33 -1000)
commit72d4c6e5893a122c2fd060ded2b490582a5bb377
treec48eef0ca22e3b3d560c436cf0b3bdb8a1912b75
parent1d176582c795d05d15245f75407a3e1db62f740a
parent5c41aaad409c097cf1ef74f2c649fed994744ef5
Merge branch 'for-linus' of git://git./linux/kernel/git/rkuo/linux-hexagon-kernel

Pull hexagon fixes from Richard Kuo:
 "Some fixes for compile warnings"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
  hexagon: modify ffs() and fls() to return int
  arch/hexagon: fix kernel/dma.c build warning