commit | 8188fc8bef8c677d28a9dbbd2db6deaee1644180 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 30 13:27:16 2018 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 30 13:27:16 2018 -0700 |
tree | 381c67b1e2957940a33fca26f9eac1c086ec1f29 | |
parent | 6da6c0db5316275015e8cc2959f12a17584aeb64 [diff] | |
parent | 00ad691ab140b54ab9f5de5e74cb994f552e8124 [diff] |
Merge git://git.kernel.org/pub/scm/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