From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Apr 2015 22:36:31 +0000 (-0700)
Subject: Merge tag 'hsi-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
X-Git-Tag: v5.15~16010
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=392b46f31f43a71c5391eb9cffe304979d2d6c30;p=mirror_ubuntu-kernels.git

Merge tag 'hsi-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Pull HSI changes from Sebastian Reichel:

 - nokia-modem: support speech data
 - misc fixes

* tag 'hsi-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: cmt_speech: fix error return code
  HSI: nokia-modem: Add cmt-speech support
  HSI: cmt_speech: Add cmt-speech driver
  HSI: nokia-modem: fix error return code
---

392b46f31f43a71c5391eb9cffe304979d2d6c30