Merge tag 'qcom-drivers-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Dec 2018 15:11:02 +0000 (16:11 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Dec 2018 15:11:34 +0000 (16:11 +0100)
commit3e730e858139c3bed9587ca50ce0f2aa12fe9523
tree6c47de7615a2f5b75ec4a8b15d2ecd646bcbe8dd
parent9f23b7ba6379fd80f0857cf4750e9eda83fe5408
parent16ad9501b1f2edebe24f8cf3c09da0695871986b
Merge tag 'qcom-drivers-for-4.21-2' of git://git./linux/kernel/git/agross/linux into next/drivers

Qualcomm ARM Based Driver Updates for v4.21 Part 2 - Redo

* Fix SCM compilation error

* tag 'qcom-drivers-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  firmware: qcom: scm: fix compilation error when disabled

Signed-off-by: Arnd Bergmann <arnd@arndb.de>