diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 15:36:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 15:36:31 -0700 |
commit | 392b46f31f43a71c5391eb9cffe304979d2d6c30 (patch) | |
tree | 50999c8f615113ee6ec6043981312a4d65d2c59e /arch/s390 | |
parent | a21c1ea65615f5323575d84508637a9481ca79c6 (diff) | |
parent | 265ef3ee9575e6d150f485d28dbe153a50d27f4c (diff) | |
download | linux-392b46f31f43a71c5391eb9cffe304979d2d6c30.tar.bz2 |
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
Diffstat (limited to 'arch/s390')
0 files changed, 0 insertions, 0 deletions