From: Olof Johansson Date: Mon, 26 May 2014 19:16:17 +0000 (-0700) Subject: Merge branch 'reset/fixes' of git://git.pengutronix.de/git/pza/linux into next/fixes... X-Git-Tag: firefly_0821_release~176^2~3448^2^2~8 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6580ad3fc1297b63a1248b6f8d6c2fac3d447cd1;p=firefly-linux-kernel-4.4.55.git Merge branch 'reset/fixes' of git://git.pengutronix.de/git/pza/linux into next/fixes-non-critical Merge a fix from Philipp Zabel: This patch fixes an erroneous revert that slipped in with commit b424080a9e086e683ad5fdc624a7cf3c024e0c0f reset: Add optional resets and stubs. * 'reset/fixes' of git://git.pengutronix.de/git/pza/linux: reset: Add of_reset_control_get to reset.h Signed-off-by: Olof Johansson --- 6580ad3fc1297b63a1248b6f8d6c2fac3d447cd1