From: Olof Johansson Date: Thu, 1 Jun 2017 23:54:14 +0000 (-0700) Subject: Merge tag 'reset-fixes-for-4.12' of git://git.pengutronix.de/git/pza/linux into fixes X-Git-Tag: Ubuntu-5.2.0-15.16~6735^2~5 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=84d40c0b73966a62c4d0f40288636a2f66cac3df;p=mirror_ubuntu-eoan-kernel.git 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 --- 84d40c0b73966a62c4d0f40288636a2f66cac3df