]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 47de34f e1650ba)
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)
commit994727d25967568310da41cb523574f547eece38
tree4d0142719ddcee53f49e45e47743abc2f22f1b46tree | snapshot
parent47de34f51289b93e853362053d00b85e68bd5f88commit | diff
parente1650ba55a87a93a48c60a27344b61e90e6352f4commit | 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.