]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: da3d1d4 4497a22)
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)
commit84d40c0b73966a62c4d0f40288636a2f66cac3df
tree4d0142719ddcee53f49e45e47743abc2f22f1b46tree | snapshot
parentda3d1d4a4e6c554237466db060d53abbf0620605commit | diff
parent4497a224f759cd8350e07382307b55f870ef0df2commit | 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 for KaRo TX COM modules