From: Olof Johansson Date: Wed, 22 Mar 2017 00:33:38 +0000 (-0700) Subject: Merge tag 'reset-for-4.12-1' of git://git.pengutronix.de/git/pza/linux into next... X-Git-Tag: v4.14-rc1~950^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a618a7349f1947c775200c83ccfaeae681c5dbcb;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'reset-for-4.12-1' of git://git.pengutronix.de/git/pza/linux into next/drivers Reset controller changes for v4.12 - make reset drivers with bool Kconfig options explicitly non-modular - fix uniphier non-static symbol warnings - fix socfpga nr_resets property - new drivers for the Arria10 and i.MX7 system reset controllers - fix sunxi 64-bit compilation * tag 'reset-for-4.12-1' of git://git.pengutronix.de/git/pza/linux: reset: sunxi: fix for 64-bit compilation reset: Add Altera Arria10 SR Reset Controller dt-bindings: reset: a10sr: Add Arria10 SR Reset Controller offsets reset: Add i.MX7 SRC reset driver reset-socfpga: Fix nr_resets property reset: uniphier: fix non static symbol warnings reset: pistachio: make it explicitly non-modular reset: ath79: make it explicitly non-modular reset: oxnas: make it explicitly non-modular reset: meson: make it explicitly non-modular Signed-off-by: Olof Johansson --- a618a7349f1947c775200c83ccfaeae681c5dbcb