OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
da3d1d4
4497a22
)
Merge tag 'reset-fixes-for-4.12' of git://git.pengutronix.de/git/pza/linux into fixes
author
Olof Johansson
<olof@lixom.net>
Thu, 1 Jun 2017 23:54:14 +0000
(16:54 -0700)
committer
Olof Johansson
<olof@lixom.net>
Fri, 2 Jun 2017 00:07:33 +0000
(17:07 -0700)
Reset controller fixes for v4.12
- Set hi6220_reset driver module license to GPL v2 to fix module loading.
* tag 'reset-fixes-for-4.12' of git://git.pengutronix.de/git/pza/linux:
reset: hi6220: Set module license so that it can be loaded
Signed-off-by: Olof Johansson <olof@lixom.net>
Trivial merge