Merge tag 'hsi-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Dec 2014 01:33:47 +0000 (17:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Dec 2014 01:33:47 +0000 (17:33 -0800)
commitd3255ec483ca048192f6e8a8789e08e32b379b84
tree6581a6701069067834454b07bcebfd4360926f4d
parent60d7ef3fd34dca2eb7ef4c997ccf1ef76a9ba148
parentd95dc9e388104488d0f5a5969c435e601840da2e
Merge tag 'hsi-for-3.19' of git://git./linux/kernel/git/sre/linux-hsi

Pull HSI update from Sebastian Reichel:
 "Misc fixes in omap-ssi and nokia-modem drivers"

* tag 'hsi-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: nokia-modem: fix error handling of irq_of_parse_and_map
  HSI: nokia-modem: setup default value for pm parameter
  HSI: omap_ssi_port: Don't print uninitialized err
  HSI: remove deprecated IRQF_DISABLED
drivers/hsi/controllers/omap_ssi_port.c