projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6da6c0d 00ad691)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Apr 2018 20:27:16 +0000 (13:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Apr 2018 20:27:16 +0000 (13:27 -0700)
 - 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


Trivial merge
John Crispins staging tree