From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Jun 2018 19:09:19 +0000 (-0700)
Subject: Merge tag 'hwlock-v4.18' of git://github.com/andersson/remoteproc
X-Git-Tag: v5.15~8634
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f75edeadd0dd3d58017bc3bcdc2b80879a7cfd3;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'hwlock-v4.18' of git://github.com/andersson/remoteproc

Pull hwspinlock updates from Bjorn Andersson:
 "In addition to migrating the files to use SPDX license headers this
  introduces the ability for clients to operate a hwlock without the
  framework taking any additional locks"

* tag 'hwlock-v4.18' of git://github.com/andersson/remoteproc:
  hwspinlock/u8500: Switch to SPDX license identifier
  hwspinlock: sprd: Switch to SPDX license identifier
  hwspinlock/sirf: Switch to SPDX license identifier
  hwspinlock: qcom: Switch to SPDX license identifier
  hwspinlock/omap: Switch to SPDX license identifier
  hwspinlock/core: Switch to SPDX license identifier
  hwspinlock: Introduce one new mode for hwspinlock
  hwspinlock: Convert to use 'switch' statement
---

6f75edeadd0dd3d58017bc3bcdc2b80879a7cfd3