Merge tag 'hsi-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
commit392b46f31f43a71c5391eb9cffe304979d2d6c30
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Apr 2015 22:36:31 +0000 (13 15:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Apr 2015 22:36:31 +0000 (13 15:36 -0700)
tree50999c8f615113ee6ec6043981312a4d65d2c59e
parenta21c1ea65615f5323575d84508637a9481ca79c6
parent265ef3ee9575e6d150f485d28dbe153a50d27f4c
Merge tag 'hsi-for-4.1' of git://git./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