]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 88e7aa3 653fac9)
Merge tag 'reset-fixes-for-4.12' of git://git.pengutronix.de/git/pza/linux into fixes
authorOlof Johansson <olof@lixom.net>
Thu, 1 Jun 2017 23:54:14 +0000 (16:54 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 2 Jun 2017 00:07:33 +0000 (17:07 -0700)
commit632a0a8e40f708be89607b42e2eff366ad3fa056
tree4d0142719ddcee53f49e45e47743abc2f22f1b46tree | snapshot
parent88e7aa381517e7ba9d637a137159f296e0405ed5commit | diff
parent653fac935c6a8ab5f74382582f78ad0f2fc8ffa4commit | diff
Merge tag 'reset-fixes-for-4.12' of git://git.pengutronix.de/git/pza/linux into fixes

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>
Linux Kernel Source Tree.