From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Apr 2018 20:27:16 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v4.17-rc4~32
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8188fc8bef8c677d28a9dbbd2db6deaee1644180;p=linux-2.6-block.git

Merge git://git./linux/kernel/git/davem/sparc

 - Fixup license text for oradax driver, from Rob Gardner.

 - Release device object with put_device() instead of straight kfree(),
   from Arvind Yadav.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: vio: use put_device() instead of kfree()
  sparc64: Fix mistake in oradax license text
---

8188fc8bef8c677d28a9dbbd2db6deaee1644180