From: Olof Johansson Date: Mon, 19 Jun 2017 02:03:39 +0000 (-0700) Subject: Merge tag 'reset-for-4.13' of git://git.pengutronix.de/git/pza/linux into next/drivers X-Git-Tag: v4.13-rc1~166^2~11 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b4a35876d7fadc6138ee0b12342cab622981dbd;p=karo-tx-linux.git Merge tag 'reset-for-4.13' of git://git.pengutronix.de/git/pza/linux into next/drivers Reset controller changes for v4.13 - Use devm_kcalloc to allocate the channels array in sti/reset-syscfg - Rename the TI_SYSCON_RESET Kconfig option to RESET_TI_SYSCON for consistency - Add new reset driver and DT bindings for Cortina Systems Gemini reset controller * tag 'reset-for-4.13' of git://git.pengutronix.de/git/pza/linux: reset: Add a Gemini reset controller reset: add DT bindings header for Gemini reset controller reset: ti_syscon: Rename TI_SYSCON_RESET to RESET_TI_SYSCON reset: sti: Use devm_kcalloc() in syscfg_reset_controller_register() Signed-off-by: Olof Johansson --- 8b4a35876d7fadc6138ee0b12342cab622981dbd