From: Arnd Bergmann Date: Thu, 27 Mar 2014 00:28:19 +0000 (+0100) Subject: Merge branch 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux into next... X-Git-Tag: firefly_0821_release~176^2~4130^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=463e8474af8317c3bfc0dc95b0d003e11e847b40;p=firefly-linux-kernel-4.4.55.git Merge branch 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux into next/drivers Merge "reset controller fixes and updates" from Philipp Zabel: * 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux: reset: Add optional resets and stubs reset: Add of_reset_control_get reset: Mark function as static and remove unused function in core.c reset: allow drivers to request probe deferral Signed-off-by: Arnd Bergmann --- 463e8474af8317c3bfc0dc95b0d003e11e847b40