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>