From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Sep 2018 02:33:26 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux... 
X-Git-Tag: v4.19-rc4~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72d4c6e5893a122c2fd060ded2b490582a5bb377;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

72d4c6e5893a122c2fd060ded2b490582a5bb377