From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Nov 2017 21:35:43 +0000 (-0800)
Subject: Merge tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
X-Git-Tag: v4.19~2188
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'hsi-for-4.15' of git://git./linux/kernel/git/sre/linux-hsi

Pull HSI updates from Sebastian Reichel:

 - add HSI OMAP4 bindings

 - misc small fixes

* tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  dt-bindings: hsi: add omap4 hsi controller bindings
  HSI: hsi_char: pr_err() strings should end with newlines
  HSI: omap_ssi_core: fix kilo to be "k" not "K"
---

6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f